blame | history | patch | commit | commitdiff | ignore whitespace
kaiyu
2021-06-24 eb51b2364e9a3fbe806fde61fa255660a098fc8b 
 screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java


@@ -3,10 +3,8 @@


import com.alibaba.fastjson.JSON;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


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.SysDictData;


import com.moral.api.entity.VersionSensorUnit;


import com.moral.api.entity.*;


import com.moral.api.mapper.OrganizationUnitAlarmMapper;


import com.moral.api.mapper.SensorMapper;


import com.moral.api.mapper.SysDictDataMapper;


import com.moral.api.mapper.VersionSensorUnitMapper;


@@ -52,6 +50,9 @@




    @Autowired(required = false)


    private SysDictDataMapper sysDictDataMapper;




    @Autowired(required = false)


    private OrganizationUnitAlarmMapper organizationUnitAlarmMapper;




    @Autowired


    LogUtils logUtils;


@@ -131,6 +132,14 @@


            return resultMap;


        }


        sensorMapper.updateSensor(updateSensorMap);


        if (!ObjectUtils.isEmpty(updateSensorMap.get("code"))&&!oldSensor.getCode().equals(updateSensorMap.get("code"))){


            QueryWrapper<OrganizationUnitAlarm> wrapper_OUA = new QueryWrapper<>();


            wrapper_OUA.eq("is_delete",Constants.NOT_DELETE);


            wrapper_OUA.eq("sensor_code",oldSensor.getCode());


            OrganizationUnitAlarm organizationUnitAlarm = new OrganizationUnitAlarm();


            organizationUnitAlarm.setSensorCode(updateSensorMap.get("code").toString());


            organizationUnitAlarmMapper.update(organizationUnitAlarm,wrapper_OUA);


        }


        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();


        String content = "修改因子:"+oldSensor.getName()+";";


        for (Object key:updateSensorMap.keySet()) {


@@ -269,6 +278,14 @@


        VersionSensorUnit versionSensorUnit = new VersionSensorUnit();


        versionSensorUnit.setIsDelete(Constants.DELETE);


        versionSensorUnitMapper.update(versionSensorUnit,wrapper_Version);


        if (!ObjectUtils.isEmpty(sensor.getCode())&&!sensor.getCode().equals("")){


            QueryWrapper<OrganizationUnitAlarm> wrapper_OUA = new QueryWrapper<>();


            wrapper_OUA.eq("is_delete",Constants.NOT_DELETE);


            wrapper_OUA.eq("sensor_code",sensor.getCode());


            OrganizationUnitAlarm organizationUnitAlarm = new OrganizationUnitAlarm();


            organizationUnitAlarm.setIsDelete(Constants.DELETE);


            organizationUnitAlarmMapper.update(organizationUnitAlarm,wrapper_OUA);


        }


        //操作插入日志


        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();


        String content = "删除因子:"+sensor.getName()+";";