因子默认单位添加；角色、菜单更新判断是否更改

lizijie

2021-05-24 9931aa31c53b29878454f07e85d6463d26fd1c25

因子默认单位添加；角色、菜单更新判断是否更改

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

@@ -92,21 +92,24 @@
            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
            String content = "修改了菜单:"+manageMenuOld.getName()+";";
            for (Object key:map.keySet()) {
                if (key.toString().equals("name")){
                if (key.toString().equals("name")&&map.get(key)!=null){
                    content = content+"菜单名:"+manageMenuOld.getName()+"->"+map.get(key)+";";
                }
                if (key.toString().equals("url")){
                if (key.toString().equals("url")&&map.get(key)!=null){
                    content = content+"url地址:"+manageMenuOld.getUrl()+"->"+map.get(key)+";";
                }
                if (key.toString().equals("icon")){
                if (key.toString().equals("icon")&&map.get(key)!=null){
                    content = content+"图标地址:"+manageMenuOld.getIcon()+"->"+map.get(key)+";";
                }
                if (key.toString().equals("parent_id")){
                if (key.toString().equals("parent_id")&&map.get(key)!=null){
                    content = content+"父菜单:"+manageMenuMapper.getManageMenuById(manageMenuOld.getId()).getName()+"->"+manageMenuMapper.getManageMenuById(Integer.parseInt(map.get(key).toString())).getName()+";";
                }
                if (key.toString().equals("order")){
                if (key.toString().equals("order")&&map.get(key)!=null){
                    content = content+"同一级别菜单顺序:"+manageMenuOld.getOrder()+"->"+map.get(key)+";";
                }
                if (key.toString().equals("desc")&&map.get(key)!=null){
                    content = content+"描述:"+manageMenuOld.getDesc()+"->"+map.get(key)+";";
                }
            }
            logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
            resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());

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

@@ -156,10 +156,10 @@
            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
            String content = "修改了角色:"+manageRoleOld.getName()+";";
            for (Object key:map.keySet()) {
                if (key.toString().equals("name")){
                if (key.toString().equals("name")&&map.get(key)!=null){
                    content = content+"角色名:"+manageRoleOld.getName()+"->"+map.get(key)+";";
                }
                if (key.toString().equals("desc")){
                if (key.toString().equals("desc")&&map.get(key)!=null){
                    content = content+"备注:"+manageRoleOld.getDesc()+"->"+map.get(key)+";";
                }
            }

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

@@ -5,8 +5,10 @@
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.mapper.SensorMapper;
import com.moral.api.mapper.SysDictDataMapper;
import com.moral.api.mapper.VersionSensorUnitMapper;
import com.moral.api.service.SensorService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -47,6 +49,9 @@

    @Autowired(required = false)
    private VersionSensorUnitMapper versionSensorUnitMapper;

    @Autowired(required = false)
    private SysDictDataMapper sysDictDataMapper;

    @Autowired
    LogUtils logUtils;
@@ -188,6 +193,15 @@
            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);
                Map<String,Object> defaultUnitMap = new HashMap<>();
                defaultUnitMap.put(sensor.getDefaultUnitKey(),sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
                sensorMap.put("default_unit_key",defaultUnitMap);
            }
            sensorList.add(sensorMap);
        }
        resultMap.put("sensors",sensorList);
@@ -263,6 +277,15 @@
            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);
                Map<String,Object> defaultUnitMap = new HashMap<>();
                defaultUnitMap.put(sensor.getDefaultUnitKey(),sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
                sensorMap.put("default_unit_key",defaultUnitMap);
            }
            sensorList.add(sensorMap);
        }
        resultMap.put("sensors",sensorList);