~chenjialiang/moral.git

parent: ea814240 | patch | commit | ignore whitespace

kaiyu

2021-05-20 7537e950c29dd68a34f16cf1e841fa548c89d58d

screen-manage
                      型号更新以及增加功能完成

2 files added

6 files modified

	screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java	4 ●●●●● patch \| view \| raw \| blame \| history
	screen-manage/src/main/java/com/moral/api/controller/VersionController.java	32 ●●●●● patch \| view \| raw \| blame \| history
	screen-manage/src/main/java/com/moral/api/pojo/dto/version/VersionDTO.java	2 ●●●●● patch \| view \| raw \| blame \| history
	screen-manage/src/main/java/com/moral/api/pojo/form/version/VersionInsertForm.java	33 ●●●●● patch \| view \| raw \| blame \| history
	screen-manage/src/main/java/com/moral/api/pojo/form/version/VersionQueryForm.java	2 ●●●●● patch \| view \| raw \| blame \| history
	screen-manage/src/main/java/com/moral/api/pojo/form/version/VersionUpdateForm.java	39 ●●●●● patch \| view \| raw \| blame \| history
	screen-manage/src/main/java/com/moral/api/service/VersionService.java	21 ●●●●● patch \| view \| raw \| blame \| history
	screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java	67 ●●●●● patch \| view \| raw \| blame \| history

 screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java

@@ -51,7 +51,9 @@
    SENSOR_IS_NOT_EXIST(-37, "因子不存在"),
    UNIT_CONVERSION_EXIST(-38,"换算公式已经存在"),
    MONITOR_POINT_IS_EXIST(-39,"站点已存在"),
    MONITOR_POINT_IS_NOT_EXIST(-40,"站点不存在")
    MONITOR_POINT_IS_NOT_EXIST(-40,"站点不存在"),
    VERSION_NOT_EXIST(-41,"版本不存在"),
    VERSION_EXIST(-42,"版本已经存在")
    ;
    private final Integer code;
    private final String  msg;

 screen-manage/src/main/java/com/moral/api/controller/VersionController.java

@@ -2,8 +2,11 @@

import com.moral.api.entity.Version;
import com.moral.api.mapper.VersionMapper;
import com.moral.api.pojo.dto.version.VersionDTO;
import com.moral.api.pojo.dto.version.VersionQueryDTO;
import com.moral.api.pojo.form.version.VersionInsertForm;
import com.moral.api.pojo.form.version.VersionQueryForm;
import com.moral.api.pojo.form.version.VersionUpdateForm;
import com.moral.api.pojo.vo.Version.VersionQueryVO;
import com.moral.api.pojo.vo.Version.VersionVO;
import com.moral.api.service.VersionService;
@@ -12,9 +15,7 @@
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.Arrays;
import java.util.List;
@@ -48,6 +49,31 @@
        VersionQueryVO vo = VersionQueryVO.convert(dto);

        return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
    }

    @PostMapping("update")
    public ResultMessage update(@RequestBody VersionUpdateForm form){
        //判断是否缺少参数
        if (!form.valid())
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());

        //处理更新业务
        VersionDTO dto = versionService.update(form);

        return new ResultMessage(dto.getCode(), dto.getMsg(), null);
    }

    @PostMapping("insert")
    public ResultMessage insert(@RequestBody VersionInsertForm form){
        //判断是否缺少参数
        if (!form.valid())
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());

        //处理插入业务
        VersionDTO dto = versionService.insert(form);

        return new ResultMessage(dto.getCode(), dto.getMsg(), null);
    }
}

 screen-manage/src/main/java/com/moral/api/pojo/dto/version/VersionDTO.java

@@ -3,6 +3,7 @@
import com.moral.api.entity.Sensor;
import com.moral.api.entity.Version;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.List;

@@ -14,6 +15,7 @@
 * @Version TODO
 **/
@Data
@NoArgsConstructor
public class VersionDTO {

    private Integer code;

 screen-manage/src/main/java/com/moral/api/pojo/form/version/VersionInsertForm.java

New file
@@ -0,0 +1,33 @@
package com.moral.api.pojo.form.version;

import com.moral.api.entity.Version;
import lombok.Data;
import org.springframework.util.ObjectUtils;

/**
 * @ClassName VersionInsertForm
 * @Description TODO
 * @Author 陈凯裕
 * @Date 2021/5/20 11:55
 * @Version TODO
 **/
@Data
public class VersionInsertForm {

    private String name;

    private String desc;

    public boolean valid(){
        if(ObjectUtils.isEmpty(name))
            return false;
        return true;
    }

    public Version formConvertEntity(){
        Version version = new Version();
        version.setName(name);
        version.setDesc(desc);
        return version;
    }
}

 screen-manage/src/main/java/com/moral/api/pojo/form/version/VersionQueryForm.java

@@ -27,6 +27,8 @@

    private String orderType;

    private Integer isDelete;

    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    private Date createStartTime;

 screen-manage/src/main/java/com/moral/api/pojo/form/version/VersionUpdateForm.java

New file
@@ -0,0 +1,39 @@
package com.moral.api.pojo.form.version;

import com.moral.api.entity.Version;
import lombok.Data;
import org.springframework.util.ObjectUtils;

/**
 * @ClassName VersionUpdateForm
 * @Description TODO
 * @Author 陈凯裕
 * @Date 2021/5/20 11:26
 * @Version TODO
 **/
@Data
public class VersionUpdateForm {

    private Integer id;

    private String name;

    private String desc;

    public boolean valid() {
        if (ObjectUtils.isEmpty(id) ||
                (ObjectUtils.isEmpty(name) &&
                        ObjectUtils.isEmpty(desc))
                )
            return false;
        return true;
    }

    public Version formConvertEntity(){
        Version version = new Version();
        version.setId(id);
        version.setName(name);
        version.setDesc(desc);
        return version;
    }
}

 screen-manage/src/main/java/com/moral/api/service/VersionService.java

@@ -2,8 +2,11 @@

import com.moral.api.entity.Version;
import com.baomidou.mybatisplus.extension.service.IService;
import com.moral.api.pojo.dto.version.VersionDTO;
import com.moral.api.pojo.dto.version.VersionQueryDTO;
import com.moral.api.pojo.form.version.VersionInsertForm;
import com.moral.api.pojo.form.version.VersionQueryForm;
import com.moral.api.pojo.form.version.VersionUpdateForm;

/**
 * <p>
@@ -24,4 +27,22 @@
            */
    VersionQueryDTO query(VersionQueryForm form);

    /**
    * @Description: 更新version基本信息
            * @Param: [form]
            * @return: com.moral.api.pojo.dto.version.VersionDTO
            * @Author: 陈凯裕
            * @Date: 2021/5/20
            */
    VersionDTO update(VersionUpdateForm form);

    /**
    * @Description: 新增version
            * @Param: [form]
            * @return: com.moral.api.pojo.dto.version.VersionDTO
            * @Author: 陈凯裕
            * @Date: 2021/5/20
            */
    VersionDTO insert(VersionInsertForm form);

}

 screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java

@@ -10,14 +10,18 @@
import com.moral.api.mapper.VersionSensorUnitMapper;
import com.moral.api.pojo.dto.version.VersionDTO;
import com.moral.api.pojo.dto.version.VersionQueryDTO;
import com.moral.api.pojo.form.version.VersionInsertForm;
import com.moral.api.pojo.form.version.VersionQueryForm;
import com.moral.api.pojo.form.version.VersionUpdateForm;
import com.moral.api.service.VersionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.ConvertUtils;
import org.apache.tomcat.websocket.WsRemoteEndpointAsync;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;

import java.util.ArrayList;
@@ -54,6 +58,7 @@
        Date updateEndTime = form.getUpdateEndTime();
        String order = form.getOrder();
        String orderType = form.getOrderType();
        Integer isDelete = form.getIsDelete();
        //组装查询条件
        Page<Version> queryPage = new Page<>(page, size);
        NullFilterWrapper<Version> wrapper = new NullFilterWrapper<>();
@@ -67,6 +72,11 @@
            else
                wrapper.orderByDesc(ConvertUtils.toLine(order));
        }
        //逻辑删除条件构造
        if (!ObjectUtils.isEmpty(isDelete))
            wrapper.eq("is_delete", isDelete);
        else
            wrapper.eq("is_delete", Constants.NOT_DELETE);
        //查询结果
        Page<Version> versionsPage = versionMapper.selectPage(queryPage, wrapper);
        List<Version> versions = versionsPage.getRecords();
@@ -89,4 +99,61 @@
        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
        return dto;
    }

    @Override
    @Transactional
    public VersionDTO update(VersionUpdateForm form) {
        //创建返回对象
        VersionDTO dto = new VersionDTO();
        //取参
        Version version = form.formConvertEntity();
        //查找要更新的version 用于插入日志
        QueryWrapper<Version> oldVersionWrapper = new QueryWrapper<>();
        Version oldVersion = new Version();
        oldVersion.setId(version.getId());
        oldVersion.setIsDelete(Constants.NOT_DELETE);
        oldVersionWrapper.setEntity(oldVersion);
        oldVersion = versionMapper.selectOne(oldVersionWrapper);
        if (ObjectUtils.isEmpty(oldVersion)) {
            dto.setCode(ResponseCodeEnum.VERSION_NOT_EXIST.getCode());
            dto.setMsg(ResponseCodeEnum.VERSION_NOT_EXIST.getMsg());
            return dto;
        }

        //更新
        versionMapper.updateById(version);

        //封装返回结果
        dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());

        return dto;
    }

    @Override
    @Transactional
    public VersionDTO insert(VersionInsertForm form) {
        //创建返回对象
        VersionDTO dto = new VersionDTO();
        //取参
        Version version = form.formConvertEntity();
        //判断型号名称是否已经存在
        Version existVersion = new Version();
        existVersion.setName(version.getName());
        existVersion.setIsDelete(Constants.NOT_DELETE);
        QueryWrapper<Version> wrapper = new QueryWrapper<>();
        wrapper.setEntity(existVersion);
        Version existVersionResult = versionMapper.selectOne(wrapper);
        if(!ObjectUtils.isEmpty(existVersionResult)){
            dto.setCode(ResponseCodeEnum.VERSION_EXIST.getCode());
            dto.setMsg(ResponseCodeEnum.VERSION_EXIST.getMsg());
            return dto;
        }
        //插入
        versionMapper.insert(version);
        //封装返回结果
        dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
        return dto;
    }
}

			@@ -51,7 +51,9 @@
			SENSOR_IS_NOT_EXIST(-37, "因子不存在"),
			UNIT_CONVERSION_EXIST(-38,"换算公式已经存在"),
			MONITOR_POINT_IS_EXIST(-39,"站点已存在"),
			MONITOR_POINT_IS_NOT_EXIST(-40,"站点不存在")
			MONITOR_POINT_IS_NOT_EXIST(-40,"站点不存在"),
			VERSION_NOT_EXIST(-41,"版本不存在"),
			VERSION_EXIST(-42,"版本已经存在")
			;
			private final Integer code;
			private final String msg;

			@@ -2,8 +2,11 @@

			import com.moral.api.entity.Version;
			import com.moral.api.mapper.VersionMapper;
			import com.moral.api.pojo.dto.version.VersionDTO;
			import com.moral.api.pojo.dto.version.VersionQueryDTO;
			import com.moral.api.pojo.form.version.VersionInsertForm;
			import com.moral.api.pojo.form.version.VersionQueryForm;
			import com.moral.api.pojo.form.version.VersionUpdateForm;
			import com.moral.api.pojo.vo.Version.VersionQueryVO;
			import com.moral.api.pojo.vo.Version.VersionVO;
			import com.moral.api.service.VersionService;
			@@ -12,9 +15,7 @@
			import io.swagger.annotations.Api;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.web.bind.annotation.GetMapping;
			import org.springframework.web.bind.annotation.RequestMapping;
			import org.springframework.web.bind.annotation.RestController;
			import org.springframework.web.bind.annotation.*;

			import java.util.Arrays;
			import java.util.List;
			@@ -48,6 +49,31 @@
			VersionQueryVO vo = VersionQueryVO.convert(dto);

			return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
			}

			@PostMapping("update")
			public ResultMessage update(@RequestBody VersionUpdateForm form){
			//判断是否缺少参数
			if (!form.valid())
			return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
			ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());

			//处理更新业务
			VersionDTO dto = versionService.update(form);

			return new ResultMessage(dto.getCode(), dto.getMsg(), null);
			}

			@PostMapping("insert")
			public ResultMessage insert(@RequestBody VersionInsertForm form){
			//判断是否缺少参数
			if (!form.valid())
			return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
			ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());

			//处理插入业务
			VersionDTO dto = versionService.insert(form);

			return new ResultMessage(dto.getCode(), dto.getMsg(), null);
			}
			}

			@@ -3,6 +3,7 @@
			import com.moral.api.entity.Sensor;
			import com.moral.api.entity.Version;
			import lombok.Data;
			import lombok.NoArgsConstructor;

			import java.util.List;

			@@ -14,6 +15,7 @@
			* @Version TODO
			**/
			@Data
			@NoArgsConstructor
			public class VersionDTO {

			private Integer code;

New file
			@@ -0,0 +1,33 @@
			package com.moral.api.pojo.form.version;

			import com.moral.api.entity.Version;
			import lombok.Data;
			import org.springframework.util.ObjectUtils;

			/**
			* @ClassName VersionInsertForm
			* @Description TODO
			* @Author 陈凯裕
			* @Date 2021/5/20 11:55
			* @Version TODO
			**/
			@Data
			public class VersionInsertForm {

			private String name;

			private String desc;

			public boolean valid(){
			if(ObjectUtils.isEmpty(name))
			return false;
			return true;
			}

			public Version formConvertEntity(){
			Version version = new Version();
			version.setName(name);
			version.setDesc(desc);
			return version;
			}
			}

			@@ -27,6 +27,8 @@

			private String orderType;

			private Integer isDelete;

			@DateTimeFormat(pattern = "yyyy-MM-dd")
			@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
			private Date createStartTime;

New file
			@@ -0,0 +1,39 @@
			package com.moral.api.pojo.form.version;

			import com.moral.api.entity.Version;
			import lombok.Data;
			import org.springframework.util.ObjectUtils;

			/**
			* @ClassName VersionUpdateForm
			* @Description TODO
			* @Author 陈凯裕
			* @Date 2021/5/20 11:26
			* @Version TODO
			**/
			@Data
			public class VersionUpdateForm {

			private Integer id;

			private String name;

			private String desc;

			public boolean valid() {
			if (ObjectUtils.isEmpty(id) \|\|
			(ObjectUtils.isEmpty(name) &&
			ObjectUtils.isEmpty(desc))
			)
			return false;
			return true;
			}

			public Version formConvertEntity(){
			Version version = new Version();
			version.setId(id);
			version.setName(name);
			version.setDesc(desc);
			return version;
			}
			}

			@@ -2,8 +2,11 @@

			import com.moral.api.entity.Version;
			import com.baomidou.mybatisplus.extension.service.IService;
			import com.moral.api.pojo.dto.version.VersionDTO;
			import com.moral.api.pojo.dto.version.VersionQueryDTO;
			import com.moral.api.pojo.form.version.VersionInsertForm;
			import com.moral.api.pojo.form.version.VersionQueryForm;
			import com.moral.api.pojo.form.version.VersionUpdateForm;

			/**
			* <p>
			@@ -24,4 +27,22 @@
			*/
			VersionQueryDTO query(VersionQueryForm form);

			/**
			* @Description: 更新version基本信息
			* @Param: [form]
			* @return: com.moral.api.pojo.dto.version.VersionDTO
			* @Author: 陈凯裕
			* @Date: 2021/5/20
			*/
			VersionDTO update(VersionUpdateForm form);

			/**
			* @Description: 新增version
			* @Param: [form]
			* @return: com.moral.api.pojo.dto.version.VersionDTO
			* @Author: 陈凯裕
			* @Date: 2021/5/20
			*/
			VersionDTO insert(VersionInsertForm form);

			}

			@@ -10,14 +10,18 @@
			import com.moral.api.mapper.VersionSensorUnitMapper;
			import com.moral.api.pojo.dto.version.VersionDTO;
			import com.moral.api.pojo.dto.version.VersionQueryDTO;
			import com.moral.api.pojo.form.version.VersionInsertForm;
			import com.moral.api.pojo.form.version.VersionQueryForm;
			import com.moral.api.pojo.form.version.VersionUpdateForm;
			import com.moral.api.service.VersionService;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.moral.constant.Constants;
			import com.moral.constant.ResponseCodeEnum;
			import com.moral.util.ConvertUtils;
			import org.apache.tomcat.websocket.WsRemoteEndpointAsync;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.util.ObjectUtils;

			import java.util.ArrayList;
			@@ -54,6 +58,7 @@
			Date updateEndTime = form.getUpdateEndTime();
			String order = form.getOrder();
			String orderType = form.getOrderType();
			Integer isDelete = form.getIsDelete();
			//组装查询条件
			Page<Version> queryPage = new Page<>(page, size);
			NullFilterWrapper<Version> wrapper = new NullFilterWrapper<>();
			@@ -67,6 +72,11 @@
			else
			wrapper.orderByDesc(ConvertUtils.toLine(order));
			}
			//逻辑删除条件构造
			if (!ObjectUtils.isEmpty(isDelete))
			wrapper.eq("is_delete", isDelete);
			else
			wrapper.eq("is_delete", Constants.NOT_DELETE);
			//查询结果
			Page<Version> versionsPage = versionMapper.selectPage(queryPage, wrapper);
			List<Version> versions = versionsPage.getRecords();
			@@ -89,4 +99,61 @@
			dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
			return dto;
			}

			@Override
			@Transactional
			public VersionDTO update(VersionUpdateForm form) {
			//创建返回对象
			VersionDTO dto = new VersionDTO();
			//取参
			Version version = form.formConvertEntity();
			//查找要更新的version 用于插入日志
			QueryWrapper<Version> oldVersionWrapper = new QueryWrapper<>();
			Version oldVersion = new Version();
			oldVersion.setId(version.getId());
			oldVersion.setIsDelete(Constants.NOT_DELETE);
			oldVersionWrapper.setEntity(oldVersion);
			oldVersion = versionMapper.selectOne(oldVersionWrapper);
			if (ObjectUtils.isEmpty(oldVersion)) {
			dto.setCode(ResponseCodeEnum.VERSION_NOT_EXIST.getCode());
			dto.setMsg(ResponseCodeEnum.VERSION_NOT_EXIST.getMsg());
			return dto;
			}

			//更新
			versionMapper.updateById(version);

			//封装返回结果
			dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
			dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());

			return dto;
			}

			@Override
			@Transactional
			public VersionDTO insert(VersionInsertForm form) {
			//创建返回对象
			VersionDTO dto = new VersionDTO();
			//取参
			Version version = form.formConvertEntity();
			//判断型号名称是否已经存在
			Version existVersion = new Version();
			existVersion.setName(version.getName());
			existVersion.setIsDelete(Constants.NOT_DELETE);
			QueryWrapper<Version> wrapper = new QueryWrapper<>();
			wrapper.setEntity(existVersion);
			Version existVersionResult = versionMapper.selectOne(wrapper);
			if(!ObjectUtils.isEmpty(existVersionResult)){
			dto.setCode(ResponseCodeEnum.VERSION_EXIST.getCode());
			dto.setMsg(ResponseCodeEnum.VERSION_EXIST.getMsg());
			return dto;
			}
			//插入
			versionMapper.insert(version);
			//封装返回结果
			dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
			dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
			return dto;
			}
			}