screen-manage 单位转换插入添加日志功能 修复organization...

kaiyu

2021-08-26 19b72fbd2e6b30a23a06dd284619784a096bc896

screen-manage
                 单位转换插入添加日志功能
                 修复organization插入Bug

 screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationUpdateForm.java

@@ -67,9 +67,9 @@
                        ObjectUtils.isEmpty(areaCode) &&
                        ObjectUtils.isEmpty(locationLevelCode) &&
                        ObjectUtils.isEmpty(address) &&
                        ObjectUtils.isEmpty(phone) &&
                        ObjectUtils.isEmpty(email) &&
                        ObjectUtils.isEmpty(wechat) &&
                        phone==null &&
                        email==null &&
                        wechat==null &&
                        ObjectUtils.isEmpty(expireTime)
                )
            return false;

 screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java

@@ -34,6 +34,13 @@

    private List<UnitConversionVO> unitConversions;

    /**
    * @Description: DTO转为VO
            * @Param: [dto]
            * @return: com.moral.api.pojo.vo.unitConversion.UnitConversionQueryVO
            * @Author: 陈凯裕
            * @Date: 2021/8/26
            */
    public static UnitConversionQueryVO convert(UnitConversionQueryDTO dto) {
        if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode())
            return null;
@@ -56,6 +63,13 @@
        return vo;
    }

    /**
    * @Description: 单个DTO转为VO
            * @Param: [dto]
            * @return: com.moral.api.pojo.vo.unitConversion.UnitConversionVO
            * @Author: 陈凯裕
            * @Date: 2021/8/26
            */
    private static UnitConversionVO convertToQueryPage(UnitConversionDTO dto) {
        UnitConversionVO vo = new UnitConversionVO();
        UnitConversion unitConversion = dto.getUnitConversion();
@@ -69,16 +83,4 @@
        return vo;
    }

    /**
     * @Description: 将带有占位符的公式转为带有原单位，目标单位的公式
     * @Param: [formula]
     * @return: java.lang.String
     * @Author: 陈凯裕
     * @Date: 2021/5/12
     */
    public static String formulaConvert(String formula, String originalUnitName, String targetUnitName) {
        formula = formula.replace(Constants.FORMULA_PLACEHOLDER, originalUnitName);
        formula += "=" + targetUnitName;
        return formula;
    }
}

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

@@ -35,5 +35,14 @@

    Map<String, Sensor> getAllSensorFromCache();

    /**
    * @Description: 通过code获取sensor对象
            * @Param: [code]
            * @return: com.moral.api.entity.Sensor
            * @Author: 陈凯裕
            * @Date: 2021/8/26
            */
    Sensor getSensorByCode(String code);

    void refreshCache();
}

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

@@ -30,7 +30,7 @@
    SysDictDataDTO deleteData(SysDictDataDeleteForm form);

    /**
    * @Description: 根据字典数据
    * @Description: 更新字典数据
            * @Param: [form]
            * @return: com.moral.api.entity.sysDictData
            * @Author: 陈凯裕

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

@@ -52,7 +52,6 @@
 * @since 2021-03-09
 */
@Service
@ConfigurationProperties(prefix = "log-aspect")
public class ManageAccountServiceImpl extends ServiceImpl<ManageAccountMapper, ManageAccount> implements ManageAccountService {


@@ -66,12 +65,6 @@
    ManageAccountRoleMapper manageAccountRoleMapper;
    @Autowired
    LogUtils logUtils;

    Map<String, String> manageAccountFormMap;

    public void setManageAccountFormMap(Map<String, String> manageAccountFormMap) {
        this.manageAccountFormMap = manageAccountFormMap;
    }

    /**
     * @Description: 登陆接口
@@ -375,48 +368,6 @@
        accountDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
        return accountDTO;
    }

    /**
     * @Description: 将更新操作插入日志
     * @Param: [form, newAccount, oldAccount]
     * @return: void
     * @Author: 陈凯裕
     * @Date: 2021/4/8
     */
    private void insertUpdateLog(AccountUpdateForm updateForm, ManageAccount oldAccount) {
        //操作插入日志
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        StringBuilder content = new StringBuilder();
        content.append("修改了用户：").append(oldAccount.getUserName() + ";")
                .append("账号:" + oldAccount.getAccount() + ";");
        //对象转为Map,获取对象更新前后的属性
        Map<String, Object> newParameters = JSONObject.parseObject(JSON.toJSONString(updateForm), Map.class);
        Map<String, Object> oldParameters = JSONObject.parseObject(JSON.toJSONString(oldAccount), Map.class);
        //遍历配置文件中的Map，将属性转化为汉字
        Set<String> keys = manageAccountFormMap.keySet();
        for (String key : keys) {
            String value = manageAccountFormMap.get(key);//属性对应的汉字
            if ("password".equals(key)) {//密码特殊处理，不显示在日志上
                if (!ObjectUtils.isEmpty(updateForm.getPassword())) {//判断密码是否进行了更新
                    content.append("修改了密码;");
                }
            } else {//其他属性处理
                if (newParameters.get(key) != null) {
                    String newValue = "空";
                    String oldValue = "空";
                    if (newParameters.get(key) != null && !newParameters.get(key).equals(" ")) {
                        newValue = String.valueOf(newParameters.get(key));
                    }
                    if (oldParameters.get(key) != null && !oldParameters.get(key).equals(" ")) {
                        oldValue = String.valueOf(oldParameters.get(key));
                    }
                    content.append(value + ":" + oldValue + "->" + newValue + ";");
                }
            }
        }
        logUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
    }


    /**
    * @Description: 更新操作插入日志

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

@@ -272,7 +272,7 @@
     * @Author: 陈凯裕
     * @Date: 2021/5/13
     */
    public void combinationParentChildrenMenus(List<Menu> menus) {
    private void combinationParentChildrenMenus(List<Menu> menus) {
        //组合menu父子结构
        Map<Integer, Menu> menuMap = new HashMap<>();
        for (Menu menu : menus) {
@@ -464,3 +464,4 @@
    }

}


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

@@ -50,7 +50,6 @@
 * @since 2021-04-06
 */
@Service
@ConfigurationProperties(prefix = "log-aspect")
public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Organization> implements OrganizationService {

    @Autowired
@@ -67,12 +66,6 @@

    @Autowired
    MonitorPointService monitorPointService;

    Map<String, String> organizationFormMap;

    public void setOrganizationFormMap(Map<String, String> organizationFormMap) {
        this.organizationFormMap = organizationFormMap;
    }

    /**
     * @Description: 添加客户组织

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

@@ -33,7 +33,7 @@

/**
 * <p>
 *  服务实现类
 * 服务实现类
 * </p>
 *
 * @author moral
@@ -64,35 +64,35 @@
    @Override
    @Transactional
    public Map<String, Object> insertOne(Sensor sensor) {
        Map<String,Object> resultMap = new HashMap<>();
        if (sensor.getName()==null || sensor.getCode()==null){
            resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
            resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        Map<String, Object> resultMap = new HashMap<>();
        if (sensor.getName() == null || sensor.getCode() == null) {
            resultMap.put("code", ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
            resultMap.put("msg", ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
            return resultMap;
        }
        QueryWrapper<Sensor> wrapper_name = new QueryWrapper<>();
        wrapper_name.eq("name",sensor.getName());
        wrapper_name.eq("is_delete","0");
        if (sensorMapper.selectCount(wrapper_name)!=0){
            resultMap.put("code",ResponseCodeEnum.SENSOR_IS_EXIST.getCode());
            resultMap.put("msg",ResponseCodeEnum.SENSOR_IS_EXIST.getMsg());
        wrapper_name.eq("name", sensor.getName());
        wrapper_name.eq("is_delete", "0");
        if (sensorMapper.selectCount(wrapper_name) != 0) {
            resultMap.put("code", ResponseCodeEnum.SENSOR_IS_EXIST.getCode());
            resultMap.put("msg", ResponseCodeEnum.SENSOR_IS_EXIST.getMsg());
            return resultMap;
        }
        QueryWrapper<Sensor> wrapper_code = new QueryWrapper<>();
        wrapper_code.eq("code",sensor.getCode());
        wrapper_code.eq("is_delete","0");
        if (sensorMapper.selectCount(wrapper_code)!=0){
            resultMap.put("code",ResponseCodeEnum.SENSOR_KEY_IS_USED.getCode());
            resultMap.put("msg",ResponseCodeEnum.SENSOR_KEY_IS_USED.getMsg());
        wrapper_code.eq("code", sensor.getCode());
        wrapper_code.eq("is_delete", "0");
        if (sensorMapper.selectCount(wrapper_code) != 0) {
            resultMap.put("code", ResponseCodeEnum.SENSOR_KEY_IS_USED.getCode());
            resultMap.put("msg", ResponseCodeEnum.SENSOR_KEY_IS_USED.getMsg());
            return resultMap;
        }
        sensorMapper.insertOne(sensor);
        //操作插入日志
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        String content = "添加因子:"+sensor.getName()+";";
        logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
        resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
        resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
        String content = "添加因子:" + sensor.getName() + ";";
        logUtils.saveOperationForManage(request, content, Constants.INSERT_OPERATE_TYPE);
        resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
        resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
        //刷新缓存
        refreshCache();
        return resultMap;
@@ -100,201 +100,201 @@

    @Override
    @Transactional
    public Map<String, Object> updateSensor(Map<String,Object> updateSensorMap) {
        Map<String,Object> resultMap = new HashMap<>();
        if(ObjectUtils.isEmpty(updateSensorMap.get("id"))){
            resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
            resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
    public Map<String, Object> updateSensor(Map<String, Object> updateSensorMap) {
        Map<String, Object> resultMap = new HashMap<>();
        if (ObjectUtils.isEmpty(updateSensorMap.get("id"))) {
            resultMap.put("code", ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
            resultMap.put("msg", ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
            return resultMap;
        }
        if (updateSensorMap.get("name")==""){
            resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
            resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        if (updateSensorMap.get("name") == "") {
            resultMap.put("code", ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
            resultMap.put("msg", ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
            return resultMap;
        }
        if(updateSensorMap.get("code")==""){
            resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
            resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        if (updateSensorMap.get("code") == "") {
            resultMap.put("code", ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
            resultMap.put("msg", ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
            return resultMap;
        }
        Sensor oldSensor = sensorMapper.getSensorById(Integer.parseInt(updateSensorMap.get("id").toString()));
        if (ObjectUtils.isEmpty(oldSensor)){
            resultMap.put("code",ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getCode());
            resultMap.put("msg",ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getMsg());
        if (ObjectUtils.isEmpty(oldSensor)) {
            resultMap.put("code", ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getCode());
            resultMap.put("msg", ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getMsg());
            return resultMap;
        }
        QueryWrapper<Sensor> wrapper_code = new QueryWrapper<>();
        wrapper_code.eq("code",updateSensorMap.get("code"));
        wrapper_code.eq("is_delete","0");
        wrapper_code.eq("code", updateSensorMap.get("code"));
        wrapper_code.eq("is_delete", "0");
        List<Sensor> sensorList = sensorMapper.selectList(wrapper_code);
        if (sensorList.size()!=0&&!sensorList.get(0).getId().toString().equals(updateSensorMap.get("id").toString())){
            resultMap.put("code",ResponseCodeEnum.SENSOR_KEY_IS_USED.getCode());
            resultMap.put("msg",ResponseCodeEnum.SENSOR_KEY_IS_USED.getMsg());
        if (sensorList.size() != 0 && !sensorList.get(0).getId().toString().equals(updateSensorMap.get("id").toString())) {
            resultMap.put("code", ResponseCodeEnum.SENSOR_KEY_IS_USED.getCode());
            resultMap.put("msg", ResponseCodeEnum.SENSOR_KEY_IS_USED.getMsg());
            return resultMap;
        }
        sensorMapper.updateSensor(updateSensorMap);
        if (!ObjectUtils.isEmpty(updateSensorMap.get("code"))&&!oldSensor.getCode().equals(updateSensorMap.get("code"))){
        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());
            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);
            organizationUnitAlarmMapper.update(organizationUnitAlarm, wrapper_OUA);
        }
        //刷新deviceInfo缓存
        CacheUtils.refreshDeviceAlarmInfo();
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        String content = "修改因子:"+oldSensor.getName()+";";
        for (Object key:updateSensorMap.keySet()) {
            if (key.toString().equals("name")&&updateSensorMap.get(key)!=null){
                content = content+"因子名:"+oldSensor.getName()+"->"+updateSensorMap.get(key)+";";
        String content = "修改因子:" + oldSensor.getName() + ";";
        for (Object key : updateSensorMap.keySet()) {
            if (key.toString().equals("name") && updateSensorMap.get(key) != null) {
                content = content + "因子名:" + oldSensor.getName() + "->" + updateSensorMap.get(key) + ";";
            }
            if (key.toString().equals("code")&&updateSensorMap.get(key)!=null){
            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)+";";
                content = content + "编号:" + oldSensor.getCode() + "->" + updateSensorMap.get(key) + ";";
            }
            if (key.toString().equals("desc")&&updateSensorMap.get(key)!=null){
                content = content+"备注:"+oldSensor.getDesc()+"->"+updateSensorMap.get(key)+";";
            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("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("lower") && updateSensorMap.get(key) != null) {
                content = content + "下限:" + oldSensor.getDesc() + "->" + updateSensorMap.get(key) + ";";
            }
            if (key.toString().equals("default_unit_key")&&updateSensorMap.get(key)!=null){
                content = content+"默认单位:"+oldSensor.getDesc()+"->"+updateSensorMap.get(key)+";";
            if (key.toString().equals("default_unit_key") && updateSensorMap.get(key) != null) {
                content = content + "默认单位:" + oldSensor.getDesc() + "->" + updateSensorMap.get(key) + ";";
            }
        }
        logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
        resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
        resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
        logUtils.saveOperationForManage(request, content, Constants.UPDATE_OPERATE_TYPE);
        resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
        resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
        //刷新缓存
        refreshCache();
        return resultMap;
    }

    @Override
    public Map<String,Object> getAllSensor(Map map) {
        Map<String,Object> resultMap = new HashMap<>();
    public Map<String, Object> getAllSensor(Map map) {
        Map<String, Object> resultMap = new HashMap<>();
        int current = Integer.parseInt(map.get("current").toString());
        int size = Integer.parseInt(map.get("size").toString());
        Page<Sensor> page = new Page(current,size);
        Page<Sensor> page = new Page(current, size);
        QueryWrapper<Sensor> wrapper = new QueryWrapper();
        wrapper.eq("is_delete",0);
        wrapper.eq("is_delete", 0);
        int totleNum = sensorMapper.selectCount(wrapper);
        if (!ObjectUtils.isEmpty(map.get("orderType"))){
        if (!ObjectUtils.isEmpty(map.get("orderType"))) {
            String orderType = map.get("orderType").toString();
            if (orderType.equals(Constants.ORDER_DESC)){
            if (orderType.equals(Constants.ORDER_DESC)) {
                wrapper.orderByDesc("update_time");
            }else {
            } else {
                wrapper.orderByAsc("update_time");
            }
        }
        Page resultPage = sensorMapper.selectPage(page,wrapper);
        Page resultPage = sensorMapper.selectPage(page, wrapper);
        List<Sensor> sensors = resultPage.getRecords();
        SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        List<Map<String,Object>> sensorList = new ArrayList<>();
        for (Sensor sensor:sensors) {
            Map sensorMap = JSON.parseObject(JSON.toJSONString(sensor),Map.class);
        List<Map<String, Object>> sensorList = new ArrayList<>();
        for (Sensor sensor : sensors) {
            Map sensorMap = JSON.parseObject(JSON.toJSONString(sensor), Map.class);
            String createTime = SDF.format(sensor.getCreateTime());
            String updateTime = SDF.format(sensor.getUpdateTime());
            sensorMap.put("createTime",createTime);
            sensorMap.put("updateTime",updateTime);
            sensorMap.put("key",sensor.getId());
            if (sensor.getDefaultUnitKey()!=null&&sensor.getDefaultUnitKey()!=""){
            sensorMap.put("createTime", createTime);
            sensorMap.put("updateTime", updateTime);
            sensorMap.put("key", sensor.getId());
            if (sensor.getDefaultUnitKey() != null && sensor.getDefaultUnitKey() != "") {
                QueryWrapper<SysDictData> wrapper_VSU = new QueryWrapper();
                wrapper_VSU.eq("is_delete",0);
                wrapper_VSU.eq("dataKey",sensor.getDefaultUnitKey());
                wrapper_VSU.eq("dict_type_id",14);
                if (!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU))&&!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU).getDataValue())){
                    sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
                wrapper_VSU.eq("is_delete", 0);
                wrapper_VSU.eq("dataKey", sensor.getDefaultUnitKey());
                wrapper_VSU.eq("dict_type_id", 14);
                if (!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU)) && !ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU).getDataValue())) {
                    sensorMap.put("default_unit_key", sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
                }
            }
            sensorList.add(sensorMap);
        }
        resultMap.put("sensors",sensorList);
        resultMap.put("totalNumber",totleNum);
        resultMap.put("current",current);
        int totalPageNumber = totleNum/size;
        if(totleNum%size != 0){
        resultMap.put("sensors", sensorList);
        resultMap.put("totalNumber", totleNum);
        resultMap.put("current", current);
        int totalPageNumber = totleNum / size;
        if (totleNum % size != 0) {
            totalPageNumber += 1;
        }
        resultMap.put("totalPageNumber",totalPageNumber);
        resultMap.put("totalPageNumber", totalPageNumber);
        return resultMap;
    }

    @Override
    public Map<String, Object> getAllSensorWithoutPage() {
        Map<String,Object> resultMap = new HashMap<>();
        Map<String, Object> resultMap = new HashMap<>();
        QueryWrapper<Sensor> wrapper = new QueryWrapper();
        wrapper.eq("is_delete",0);
        wrapper.eq("is_delete", 0);
        List<Sensor> sensors = sensorMapper.selectList(wrapper);
        SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        List<Map<String,Object>> sensorList = new ArrayList<>();
        for (Sensor sensor:sensors) {
            Map sensorMap = JSON.parseObject(JSON.toJSONString(sensor),Map.class);
        List<Map<String, Object>> sensorList = new ArrayList<>();
        for (Sensor sensor : sensors) {
            Map sensorMap = JSON.parseObject(JSON.toJSONString(sensor), Map.class);
            String createTime = SDF.format(sensor.getCreateTime());
            String updateTime = SDF.format(sensor.getUpdateTime());
            sensorMap.put("createTime",createTime);
            sensorMap.put("updateTime",updateTime);
            sensorMap.put("key",sensor.getId());
            if (sensor.getDefaultUnitKey()!=null&&sensor.getDefaultUnitKey()!=""){
            sensorMap.put("createTime", createTime);
            sensorMap.put("updateTime", updateTime);
            sensorMap.put("key", sensor.getId());
            if (sensor.getDefaultUnitKey() != null && sensor.getDefaultUnitKey() != "") {
                QueryWrapper<SysDictData> wrapper_VSU = new QueryWrapper();
                wrapper_VSU.eq("is_delete",0);
                wrapper_VSU.eq("dataKey",sensor.getDefaultUnitKey());
                wrapper_VSU.eq("dict_type_id",14);
                if (!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU))&&!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU).getDataValue())){
                    sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
                wrapper_VSU.eq("is_delete", 0);
                wrapper_VSU.eq("dataKey", sensor.getDefaultUnitKey());
                wrapper_VSU.eq("dict_type_id", 14);
                if (!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU)) && !ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU).getDataValue())) {
                    sensorMap.put("default_unit_key", sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
                }
            }
            sensorList.add(sensorMap);
        }
        resultMap.put("sensors",sensorList);
        resultMap.put("sensors", sensorList);
        return resultMap;
    }

    @Override
    @Transactional
    public Map<String, Object> deleteSensor(Map map) {
        Map<String,Object> resultMap = new HashMap<>();
        Map<String, Object> resultMap = new HashMap<>();
        QueryWrapper<Sensor> wrapper = new QueryWrapper<>();
        wrapper.eq("id",map.get("id"));
        wrapper.eq("is_delete","0");
        wrapper.eq("id", map.get("id"));
        wrapper.eq("is_delete", "0");
        Sensor sensor = sensorMapper.selectOne(wrapper);
        if(ObjectUtils.isEmpty(sensor)){
            resultMap.put("code",ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getCode());
            resultMap.put("msg",ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getMsg());
        if (ObjectUtils.isEmpty(sensor)) {
            resultMap.put("code", ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getCode());
            resultMap.put("msg", ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getMsg());
            return resultMap;
        }
        Sensor deleteSensor = new Sensor();
        deleteSensor.setIsDelete(Constants.DELETE);
        sensorMapper.update(deleteSensor,wrapper);
        sensorMapper.update(deleteSensor, wrapper);
        QueryWrapper<VersionSensorUnit> wrapper_Version = new QueryWrapper<>();
        wrapper_Version.eq("sensor_code",sensor.getCode());
        wrapper_Version.eq("is_delete","0");
        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);
        if (!ObjectUtils.isEmpty(sensor.getCode())&&!sensor.getCode().equals("")){
        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());
            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);
            organizationUnitAlarmMapper.update(organizationUnitAlarm, wrapper_OUA);
        }
        //操作插入日志
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        String content = "删除因子:"+sensor.getName()+";";
        logUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
        resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
        resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
        String content = "删除因子:" + sensor.getName() + ";";
        logUtils.saveOperationForManage(request, content, Constants.DELETE_OPERATE_TYPE);
        resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
        resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
        //刷新缓存
        refreshCache();
        //注销token
@@ -304,82 +304,100 @@

    @Override
    public Map<String, Object> getSensorByFuzzy(Map map) {
        Map<String,Object> resultMap = new HashMap<>();
        Map<String, Object> resultMap = new HashMap<>();
        int current = Integer.parseInt(map.get("current").toString());
        int size = Integer.parseInt(map.get("size").toString());
        Page<Sensor> page = new Page(current,size);
        Page<Sensor> page = new Page(current, size);
        QueryWrapper<Sensor> wrapper = new QueryWrapper();
        wrapper.eq("is_delete",Constants.NOT_DELETE);
        wrapper.like("name",map.get("key")).or().like("code",map.get("key"));
        wrapper.eq("is_delete", Constants.NOT_DELETE);
        wrapper.like("name", map.get("key")).or().like("code", map.get("key"));
        int totleNum = sensorMapper.selectCount(wrapper);
        String orderType = map.get("orderType").toString();
        if (orderType.equals(Constants.ORDER_ASC)){
        if (orderType.equals(Constants.ORDER_ASC)) {
            wrapper.orderByAsc("update_time");
        }else {
        } else {
            wrapper.orderByDesc("update_time");
        }
        Page resultPage = sensorMapper.selectPage(page,wrapper);
        Page resultPage = sensorMapper.selectPage(page, wrapper);
        List<Sensor> sensors = resultPage.getRecords();
        SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        List<Map<String,Object>> sensorList = new ArrayList<>();
        for (Sensor sensor:sensors) {
            Map sensorMap = JSON.parseObject(JSON.toJSONString(sensor),Map.class);
        List<Map<String, Object>> sensorList = new ArrayList<>();
        for (Sensor sensor : sensors) {
            Map sensorMap = JSON.parseObject(JSON.toJSONString(sensor), Map.class);
            String createTime = SDF.format(sensor.getCreateTime());
            String updateTime = SDF.format(sensor.getUpdateTime());
            sensorMap.put("createTime",createTime);
            sensorMap.put("updateTime",updateTime);
            sensorMap.put("key",sensor.getId());
            if (sensor.getDefaultUnitKey()!=null&&!sensor.getDefaultUnitKey().equals("")){
            sensorMap.put("createTime", createTime);
            sensorMap.put("updateTime", updateTime);
            sensorMap.put("key", sensor.getId());
            if (sensor.getDefaultUnitKey() != null && !sensor.getDefaultUnitKey().equals("")) {
                QueryWrapper<SysDictData> wrapper_VSU = new QueryWrapper();
                wrapper_VSU.eq("is_delete",0);
                wrapper_VSU.eq("dataKey",sensor.getDefaultUnitKey());
                wrapper_VSU.eq("dict_type_id",14);
                sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
                wrapper_VSU.eq("is_delete", 0);
                wrapper_VSU.eq("dataKey", sensor.getDefaultUnitKey());
                wrapper_VSU.eq("dict_type_id", 14);
                sensorMap.put("default_unit_key", sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
            }
            sensorList.add(sensorMap);
        }
        resultMap.put("sensors",sensorList);
        resultMap.put("totalNumber",totleNum);
        resultMap.put("current",current);
        int totalPageNumber = totleNum/size;
        if(totleNum%size != 0){
        resultMap.put("sensors", sensorList);
        resultMap.put("totalNumber", totleNum);
        resultMap.put("current", current);
        int totalPageNumber = totleNum / size;
        if (totleNum % size != 0) {
            totalPageNumber += 1;
        }
        resultMap.put("totalPageNumber",totalPageNumber);
        resultMap.put("totalPageNumber", totalPageNumber);
        return resultMap;
    }

    @Override
    public Map<String,Sensor> getAllSensorFromCache(){
        Map<String,Sensor> sensors = redisTemplate.opsForHash().entries(RedisConstants.SENSOR_KEY);
        if(ObjectUtils.isEmpty(sensors))
            sensors =  getAllSensorFromDB();
    public Map<String, Sensor> getAllSensorFromCache() {
        Map<String, Sensor> sensors = redisTemplate.opsForHash().entries(RedisConstants.SENSOR_KEY);
        if (ObjectUtils.isEmpty(sensors))
            sensors = getAllSensorFromDB();
        //刷新缓存
        refreshCache(sensors);
        return sensors;
    }

    @Override
    public void refreshCache(){
    public Sensor getSensorByCode(String code) {
        if (code == null)
            return null;
        //从缓存中读取
        Sensor sensor = (Sensor) redisTemplate.opsForHash().get(RedisConstants.SENSOR_KEY, code);
        //如果缓存为空则从数据库读取
        if (sensor == null) {
            QueryWrapper<Sensor> wrapper = new QueryWrapper<>();
            sensor = new Sensor();
            sensor.setCode(code);
            sensor.setIsDelete(Constants.NOT_DELETE);
            wrapper.setEntity(sensor);
            sensor = sensorMapper.selectOne(wrapper);
        }
        return sensor;
    }

    @Override
    public void refreshCache() {
        Map<String, Sensor> sensors = getAllSensorFromDB();
        refreshCache(sensors);
    }

    private Map<String,Sensor> getAllSensorFromDB(){
    private Map<String, Sensor> getAllSensorFromDB() {
        QueryWrapper<Sensor> wrapper = new QueryWrapper<>();
        wrapper.eq("is_delete",Constants.NOT_DELETE);
        wrapper.eq("is_delete", Constants.NOT_DELETE);
        List<Sensor> sensors = sensorMapper.selectList(wrapper);
        Map<String,Sensor> result = new HashMap<>();
        Map<String, Sensor> result = new HashMap<>();
        for (Sensor sensor : sensors) {
            result.put(sensor.getCode(),sensor);
            result.put(sensor.getCode(), sensor);
        }
        return result;
    }

    private void refreshCache(Map<String,Sensor> sensors){
    private void refreshCache(Map<String, Sensor> sensors) {
        //删除缓存
        redisTemplate.delete(RedisConstants.SENSOR_KEY);
        //添加缓存
        redisTemplate.opsForHash().putAll(RedisConstants.SENSOR_KEY,sensors);
        redisTemplate.opsForHash().putAll(RedisConstants.SENSOR_KEY, sensors);
    }
}

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.config.mybatis.wrapper.NullFilterWrapper;
import com.moral.api.entity.Sensor;
import com.moral.api.entity.SysDictData;
import com.moral.api.entity.UnitConversion;
import com.moral.api.mapper.UnitConversionMapper;
@@ -14,9 +15,11 @@
import com.moral.api.pojo.form.unitConversion.UnitConversionInsertForm;
import com.moral.api.pojo.form.unitConversion.UnitConversionQueryForm;
import com.moral.api.pojo.form.unitConversion.UnitConversionUpdateForm;
import com.moral.api.service.SensorService;
import com.moral.api.service.SysDictDataService;
import com.moral.api.service.UnitConversionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.constant.ResponseCodeEnum;
@@ -48,6 +51,11 @@
    SysDictDataService sysDictDataService;
    @Autowired
    RedisTemplate redisTemplate;
    @Autowired
    LogUtils logUtils;
    @Autowired
    SensorService sensorService;


    @Override
    @Transactional
@@ -82,6 +90,8 @@
        unitConversionMapper.insert(unitConversion);
        //刷新缓存
        refreshCache();
        //插入日志
        insertLog(unitConversion);
        //封装返回数据
        dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
@@ -168,6 +178,7 @@
    }

    @Override
    @Transactional
    public UnitConversionDTO deleteUnitConversion(UnitConversionDeleteForm form) {
        //创建返回对象
        UnitConversionDTO dto = new UnitConversionDTO();
@@ -203,4 +214,37 @@
        if(!ObjectUtils.isEmpty(unitConversions))
            redisTemplate.opsForList().leftPushAll(RedisConstants.UNIT_CONVERSION,unitConversions);
    }

    /**
    * @Description: 插入操作插入日志
            * @Param: [unitConversion]
            * @return: void
            * @Author: 陈凯裕
            * @Date: 2021/8/26
            */
    private void insertLog(UnitConversion unitConversion){
        //获取单位字典数据
        Map<String, SysDictData> units = sysDictDataService.getDictDatasByType("unit");
        String originalUnitKey = unitConversion.getOriginalUnitKey();
        String targetUnitKey = unitConversion.getTargetUnitKey();
        SysDictData originalData = units.get(originalUnitKey);
        SysDictData targetData = units.get(targetUnitKey);
        String formula = unitConversion.getFormula();
        //公式转换格式
        formula = formula.replace(Constants.FORMULA_PLACEHOLDER, "源单位");
        formula = "目标单位"+" = "+formula;
        String sensorCode = unitConversion.getSensorCode();
        StringBuilder content = new StringBuilder();
        content.append("添加了单位转换数据;");
        content.append("源单位："+originalData.getDataValue()+";");
        content.append("目标单位："+targetData.getDataValue()+";");
        content.append("转换公式："+formula+";");
        if(sensorCode!=null){
            Sensor sensor = sensorService.getSensorByCode(sensorCode);
            if(sensor!=null)
                content.append("针对因子："+sensor.getName()+";");
        }

        logUtils.saveOperationForManage(content.toString(),Constants.INSERT_OPERATE_TYPE);
    }
}

 screen-manage/src/main/resources/application-moduleFormColumn.yml

File was deleted