sensor新增三个字段

lizijie

2021-05-19 c7397c2865a6609160780226b1d60ce7b3a04536

sensor新增三个字段

 screen-manage/src/main/java/com/moral/api/entity/Sensor.java

@@ -49,6 +49,21 @@
    private String code;

    /**
     * 上限
     */
    private Double upper;

    /**
     * 下限
     */
    private Double lower;

    /**
     * 默认单位
     */
    private String defaultUtil;

    /**
     * 创建时间
     */
    private Date createTime;

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

@@ -5,7 +5,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.ManageRole;
import com.moral.api.entity.Sensor;
import com.moral.api.entity.VersionSensorUnit;
import com.moral.api.mapper.SensorMapper;
import com.moral.api.mapper.VersionSensorUnitMapper;
import com.moral.api.service.SensorService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.util.LogUtils;
@@ -41,6 +43,9 @@

    @Autowired(required = false)
    private SensorMapper sensorMapper;

    @Autowired(required = false)
    private VersionSensorUnitMapper versionSensorUnitMapper;

    @Autowired
    LogUtils logUtils;
@@ -123,14 +128,29 @@
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        String content = "修改因子:"+oldSensor.getName()+";";
        for (Object key:updateSensorMap.keySet()) {
            if (key.toString().equals("name")){
                content = content+"角色名:"+oldSensor.getName()+"->"+updateSensorMap.get(key)+";";
            if (key.toString().equals("name")&&updateSensorMap.get(key)!=null){
                content = content+"因子名:"+oldSensor.getName()+"->"+updateSensorMap.get(key)+";";
            }
            if (key.toString().equals("code")){
            if (key.toString().equals("code")&&updateSensorMap.get(key)!=null){
                QueryWrapper<VersionSensorUnit> wrapper_Version = new QueryWrapper<>();
                wrapper_Version.eq("sensor_code",oldSensor.getCode());
                wrapper_Version.eq("is_delete","0");
                VersionSensorUnit versionSensorUnit = new VersionSensorUnit();
                versionSensorUnit.setSensorCode(updateSensorMap.get(key).toString());
                versionSensorUnitMapper.update(versionSensorUnit,wrapper_Version);
                content = content+"编号:"+oldSensor.getCode()+"->"+updateSensorMap.get(key)+";";
            }
            if (key.toString().equals("desc")){
            if (key.toString().equals("desc")&&updateSensorMap.get(key)!=null){
                content = content+"备注:"+oldSensor.getDesc()+"->"+updateSensorMap.get(key)+";";
            }
            if (key.toString().equals("upper")&&updateSensorMap.get(key)!=null){
                content = content+"上限:"+oldSensor.getDesc()+"->"+updateSensorMap.get(key)+";";
            }
            if (key.toString().equals("lower")&&updateSensorMap.get(key)!=null){
                content = content+"下限:"+oldSensor.getDesc()+"->"+updateSensorMap.get(key)+";";
            }
            if (key.toString().equals("default_util")&&updateSensorMap.get(key)!=null){
                content = content+"默认单位:"+oldSensor.getDesc()+"->"+updateSensorMap.get(key)+";";
            }
        }
        logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
@@ -194,8 +214,14 @@
            return resultMap;
        }
        Sensor deleteSensor = new Sensor();
        deleteSensor.setIsDelete("1");
        deleteSensor.setIsDelete(Constants.DELETE);
        sensorMapper.update(deleteSensor,wrapper);
        QueryWrapper<VersionSensorUnit> wrapper_Version = new QueryWrapper<>();
        wrapper_Version.eq("sensor_code",sensor.getCode());
        wrapper_Version.eq("is_delete","0");
        VersionSensorUnit versionSensorUnit = new VersionSensorUnit();
        versionSensorUnit.setIsDelete(Constants.DELETE);
        versionSensorUnitMapper.update(versionSensorUnit,wrapper_Version);
        //操作插入日志
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        String content = "删除因子:"+sensor.getName()+";";

 screen-manage/src/main/resources/mapper/SensorMapper.xml

@@ -8,13 +8,16 @@
                    <result column="name" property="name" />
                    <result column="desc" property="desc" />
                    <result column="code" property="code" />
                    <result column="upper" property="upper" />
                    <result column="lower" property="lower" />
                    <result column="default_util" property="defaultUtil" />
                    <result column="create_time" property="createTime" />
                    <result column="update_time" property="updateTime" />
                    <result column="is_delete" property="isDelete" />
        </resultMap>

    <sql id="Base_Column_List">
            s.id,s.name,s.code,s.desc,s.create_time,s.update_time,s.is_delete
            s.id,s.name,s.code,s.desc,s.upper,s.lower,s.default_util,s.create_time,s.update_time,s.is_delete
    </sql>

    <insert id="insertOne" parameterType="com.moral.api.entity.Sensor">
@@ -29,6 +32,15 @@
            <if test="desc != null">
                `desc`,
            </if>
            <if test="upper != null">
                upper,
            </if>
            <if test="lower != null">
                lower,
            </if>
            <if test="defaultUtil != null">
                default_util,
            </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="name != null">
@@ -39,6 +51,15 @@
            </if>
            <if test="desc != null">
                #{desc},
            </if>
            <if test="upper != null">
                #{upper},
            </if>
            <if test="lower != null">
                #{lower},
            </if>
            <if test="defaultUtil != null">
                #{defaultUtil},
            </if>
        </trim>
    </insert>
@@ -63,6 +84,15 @@
            <if test="code != null">
                code = #{code},
            </if>
            <if test="upper != null">
                upper = #{upper},
            </if>
            <if test="lower != null">
                lower = #{lower},
            </if>
            <if test="default_util != null">
                default_util = #{default_util},
            </if>
            <if test="isDelete != null">
                is_delete = #{isDelete},
            </if>