moral.git - Gitblit

parent: 229180e2 | patch | commit | ignore whitespace

Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-05-24 52f100ec7860c781c1b44259c6c54b221a30c100

Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

6 files modified

	screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java	13 ●●●●● patch \| view \| raw \| blame \| history
	screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleMenuServiceImpl.java	3 ●●●●● patch \| view \| raw \| blame \| history
	screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java	4 ●●●●● patch \| view \| raw \| blame \| history
	screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java	22 ●●●●● patch \| view \| raw \| blame \| history
	screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java	26 ●●●●● patch \| view \| raw \| blame \| history
	screen-manage/src/main/resources/mapper/ManageMenuMapper.xml	14 ●●●●● patch \| view \| raw \| blame \| history

 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/ManageRoleMenuServiceImpl.java

@@ -13,6 +13,7 @@
import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.TokenUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -125,6 +126,8 @@
                manageRoleMenuMapper.insertBatch(mapList);
            }
        }
        //注销token
        TokenUtils.destoryToken(id);
        List<ManageMenu> manageMenusNew = manageMenuMapper.getManageMenuByRoleId(id);
        List manageMenuOldList = new ArrayList();
        List manageMenuNewList = new ArrayList();

 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/MonitorPointServiceImpl.java

@@ -117,7 +117,7 @@
            monitorPointMap.put("key",monitorPoint.getId());
            monitorPointtList.add(monitorPointMap);
        }
        resultMap.put("manageRoles",monitorPointtList);
        resultMap.put("monitorPoints",monitorPointtList);
        resultMap.put("totalNumber",totalNumber);
        resultMap.put("current",current);
        int totalPageNumber = totalNumber/size;
@@ -137,6 +137,15 @@
            resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
            return resultMap;
        }
        QueryWrapper<MonitorPoint> wapper_id = new QueryWrapper<>();
        wapper_id.eq("id",updateMap.get("id"));
        wapper_id.eq("is_delete",Constants.NOT_DELETE);
        MonitorPoint oldMonitorPoint = monitorPointMapper.selectOne(wapper_id);
        if (oldMonitorPoint==null){
            resultMap.put("code",ResponseCodeEnum.MONITOR_POINT_IS_NOT_EXIST.getCode());
            resultMap.put("msg",ResponseCodeEnum.MONITOR_POINT_IS_NOT_EXIST.getMsg());
            return resultMap;
        }
        if (updateMap.get("name")==null||updateMap.get("name")==""){
            resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
            resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
@@ -149,15 +158,6 @@
        if(monitorPoint_name!=null&&!monitorPoint_name.getId().toString().equals(updateMap.get("id").toString())){
            resultMap.put("code",ResponseCodeEnum.MONITOR_POINT_IS_EXIST.getCode());
            resultMap.put("msg",ResponseCodeEnum.MONITOR_POINT_IS_EXIST.getMsg());
            return resultMap;
        }
        QueryWrapper<MonitorPoint> wapper_id = new QueryWrapper<>();
        wapper_id.eq("id",updateMap.get("id"));
        wapper_id.eq("is_delete",Constants.NOT_DELETE);
        MonitorPoint oldMonitorPoint = monitorPointMapper.selectOne(wapper_id);
        if (oldMonitorPoint==null){
            resultMap.put("code",ResponseCodeEnum.MONITOR_POINT_IS_NOT_EXIST.getCode());
            resultMap.put("msg",ResponseCodeEnum.MONITOR_POINT_IS_NOT_EXIST.getMsg());
            return resultMap;
        }
        monitorPointMapper.updateMonitorPoint(updateMap);
@@ -266,7 +266,7 @@
            monitorPointMap.put("key",monitorPoint.getId());
            monitorPointtList.add(monitorPointMap);
        }
        resultMap.put("manageRoles",monitorPointtList);
        resultMap.put("monitorPoints",monitorPointtList);
        resultMap.put("totalNumber",totalNumber);
        resultMap.put("current",current);
        int totalPageNumber = totalNumber/size;

 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;
@@ -14,6 +16,7 @@
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.TokenUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
@@ -46,6 +49,9 @@

    @Autowired(required = false)
    private VersionSensorUnitMapper versionSensorUnitMapper;

    @Autowired(required = false)
    private SysDictDataMapper sysDictDataMapper;

    @Autowired
    LogUtils logUtils;
@@ -187,9 +193,16 @@
            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);
                sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
            }
            sensorList.add(sensorMap);
        }
        resultMap.put("manageRoles",sensorList);
        resultMap.put("sensors",sensorList);
        resultMap.put("totalNumber",totleNum);
        resultMap.put("current",current);
        int totalPageNumber = totleNum/size;
@@ -230,6 +243,8 @@
        resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
        //刷新缓存
        refreshCache();
        //注销token
        TokenUtils.destoryToken(Integer.parseInt(map.get("id").toString()));
        return resultMap;
    }

@@ -260,9 +275,16 @@
            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);
                sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
            }
            sensorList.add(sensorMap);
        }
        resultMap.put("manageRoles",sensorList);
        resultMap.put("sensors",sensorList);
        resultMap.put("totalNumber",totleNum);
        resultMap.put("current",current);
        int totalPageNumber = totleNum/size;

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

@@ -18,7 +18,7 @@


    <sql id="Base_Column_List">
        mm.id,mm.name,mm.url,mm.icon,mm.parent_id,mm.order,mm.create_time,mm.update_time,mm.is_delete
        mm.id,mm.name,mm.url,mm.icon,mm.parent_id,mm.order,mm.create_time,mm.update_time,mm.is_delete,mm.desc
    </sql>


@@ -74,6 +74,9 @@
            <if test="order != null">
                `order`,
            </if>
            <if test="desc != null">
                `desc`,
            </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="name != null">
@@ -90,6 +93,9 @@
            </if>
            <if test="order != null">
                #{order},
            </if>
            <if test="desc != null">
                #{desc},
            </if>
        </trim>
    </insert>
@@ -114,6 +120,9 @@
            </if>
            <if test="is_delete != null">
                is_delete = #{is_delete},
            </if>
            <if test="desc != null">
                `desc` = #{desc},
            </if>
        </set>
        where id = #{id}
@@ -175,6 +184,9 @@
        <if test="order != null">
            and mm.order = #{order}
        </if>
        <if test="desc != null">
            and mm.desc = #{order}
        </if>
        limit #{start},#{number}
    </select>

			@@ -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());

			@@ -13,6 +13,7 @@
			import com.moral.api.util.LogUtils;
			import com.moral.constant.Constants;
			import com.moral.constant.ResponseCodeEnum;
			import com.moral.util.TokenUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			@@ -125,6 +126,8 @@
			manageRoleMenuMapper.insertBatch(mapList);
			}
			}
			//注销token
			TokenUtils.destoryToken(id);
			List<ManageMenu> manageMenusNew = manageMenuMapper.getManageMenuByRoleId(id);
			List manageMenuOldList = new ArrayList();
			List manageMenuNewList = new ArrayList();

			@@ -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)+";";
			}
			}

			@@ -117,7 +117,7 @@
			monitorPointMap.put("key",monitorPoint.getId());
			monitorPointtList.add(monitorPointMap);
			}
			resultMap.put("manageRoles",monitorPointtList);
			resultMap.put("monitorPoints",monitorPointtList);
			resultMap.put("totalNumber",totalNumber);
			resultMap.put("current",current);
			int totalPageNumber = totalNumber/size;
			@@ -137,6 +137,15 @@
			resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
			return resultMap;
			}
			QueryWrapper<MonitorPoint> wapper_id = new QueryWrapper<>();
			wapper_id.eq("id",updateMap.get("id"));
			wapper_id.eq("is_delete",Constants.NOT_DELETE);
			MonitorPoint oldMonitorPoint = monitorPointMapper.selectOne(wapper_id);
			if (oldMonitorPoint==null){
			resultMap.put("code",ResponseCodeEnum.MONITOR_POINT_IS_NOT_EXIST.getCode());
			resultMap.put("msg",ResponseCodeEnum.MONITOR_POINT_IS_NOT_EXIST.getMsg());
			return resultMap;
			}
			if (updateMap.get("name")==null\|\|updateMap.get("name")==""){
			resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
			resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
			@@ -149,15 +158,6 @@
			if(monitorPoint_name!=null&&!monitorPoint_name.getId().toString().equals(updateMap.get("id").toString())){
			resultMap.put("code",ResponseCodeEnum.MONITOR_POINT_IS_EXIST.getCode());
			resultMap.put("msg",ResponseCodeEnum.MONITOR_POINT_IS_EXIST.getMsg());
			return resultMap;
			}
			QueryWrapper<MonitorPoint> wapper_id = new QueryWrapper<>();
			wapper_id.eq("id",updateMap.get("id"));
			wapper_id.eq("is_delete",Constants.NOT_DELETE);
			MonitorPoint oldMonitorPoint = monitorPointMapper.selectOne(wapper_id);
			if (oldMonitorPoint==null){
			resultMap.put("code",ResponseCodeEnum.MONITOR_POINT_IS_NOT_EXIST.getCode());
			resultMap.put("msg",ResponseCodeEnum.MONITOR_POINT_IS_NOT_EXIST.getMsg());
			return resultMap;
			}
			monitorPointMapper.updateMonitorPoint(updateMap);
			@@ -266,7 +266,7 @@
			monitorPointMap.put("key",monitorPoint.getId());
			monitorPointtList.add(monitorPointMap);
			}
			resultMap.put("manageRoles",monitorPointtList);
			resultMap.put("monitorPoints",monitorPointtList);
			resultMap.put("totalNumber",totalNumber);
			resultMap.put("current",current);
			int totalPageNumber = totalNumber/size;

			@@ -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;
			@@ -14,6 +16,7 @@
			import com.moral.constant.Constants;
			import com.moral.constant.RedisConstants;
			import com.moral.constant.ResponseCodeEnum;
			import com.moral.util.TokenUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.data.redis.core.RedisTemplate;
			import org.springframework.stereotype.Service;
			@@ -46,6 +49,9 @@

			@Autowired(required = false)
			private VersionSensorUnitMapper versionSensorUnitMapper;

			@Autowired(required = false)
			private SysDictDataMapper sysDictDataMapper;

			@Autowired
			LogUtils logUtils;
			@@ -187,9 +193,16 @@
			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);
			sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
			}
			sensorList.add(sensorMap);
			}
			resultMap.put("manageRoles",sensorList);
			resultMap.put("sensors",sensorList);
			resultMap.put("totalNumber",totleNum);
			resultMap.put("current",current);
			int totalPageNumber = totleNum/size;
			@@ -230,6 +243,8 @@
			resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
			//刷新缓存
			refreshCache();
			//注销token
			TokenUtils.destoryToken(Integer.parseInt(map.get("id").toString()));
			return resultMap;
			}

			@@ -260,9 +275,16 @@
			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);
			sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
			}
			sensorList.add(sensorMap);
			}
			resultMap.put("manageRoles",sensorList);
			resultMap.put("sensors",sensorList);
			resultMap.put("totalNumber",totleNum);
			resultMap.put("current",current);
			int totalPageNumber = totleNum/size;

			@@ -18,7 +18,7 @@


			<sql id="Base_Column_List">
			mm.id,mm.name,mm.url,mm.icon,mm.parent_id,mm.order,mm.create_time,mm.update_time,mm.is_delete
			mm.id,mm.name,mm.url,mm.icon,mm.parent_id,mm.order,mm.create_time,mm.update_time,mm.is_delete,mm.desc
			</sql>


			@@ -74,6 +74,9 @@
			<if test="order != null">
			`order`,
			</if>
			<if test="desc != null">
			`desc`,
			</if>
			</trim>
			<trim prefix="values (" suffix=")" suffixOverrides=",">
			<if test="name != null">
			@@ -90,6 +93,9 @@
			</if>
			<if test="order != null">
			#{order},
			</if>
			<if test="desc != null">
			#{desc},
			</if>
			</trim>
			</insert>
			@@ -114,6 +120,9 @@
			</if>
			<if test="is_delete != null">
			is_delete = #{is_delete},
			</if>
			<if test="desc != null">
			`desc` = #{desc},
			</if>
			</set>
			where id = #{id}
			@@ -175,6 +184,9 @@
			<if test="order != null">
			and mm.order = #{order}
			</if>
			<if test="desc != null">
			and mm.desc = #{order}
			</if>
			limit #{start},#{number}
			</select>