moral.git - Gitblit

			@@ -12,7 +12,7 @@
			<result column="is_delete" property="isDelete"/>
			</resultMap>

			<select id="selectUserGroup" resultMap="GroupResultMap">
			<select id="selectUserGroup" resultMap="BaseResultMap">
			SELECT g.id,g.group_name
			FROM `group` g,`user_group` ug
			WHERE ug.user_id = #{userId}

			@@ -85,11 +85,11 @@
			resultMap.put("msg",ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getMsg());
			return resultMap;
			}
			//deviceAdjustValueMapper.insert(deviceAdjustValue);
			deviceAdjustValueMapper.insert(deviceAdjustValue);
			//操作插入日志
			HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
			String content = "添加了"+deviceAdjustValue.getMac()+"设备"+deviceAdjustValue.getSensorCode()+"传感器"+deviceAdjustValue.getStartTime()+"到"+deviceAdjustValue.getEndTime()+"的校准信息:"+";";
			//logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
			logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
			//刷新缓存
			refreshCache(deviceAdjustValue.getMac());
			resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
			@@ -276,7 +276,9 @@
			//删除缓存
			redisTemplate.delete("adjust_"+mac);
			//添加缓存
			redisTemplate.opsForHash().putAll("adjust_"+mac,deviceAdjustValueMap);
			if (!ObjectUtils.isEmpty(deviceAdjustValueMap)){
			redisTemplate.opsForHash().putAll("adjust_"+mac,deviceAdjustValueMap);
			}
			}

			}

	moral.iml	2 ●●●●● patch \| view \| raw \| blame \| history
	myBatisPlusGenerator/myBatisPlusGenerator.iml	137 ●●●●● patch \| view \| raw \| blame \| history
	pom.xml	1 ●●●●● patch \| view \| raw \| blame \| history
	screen-api/src/main/resources/mapper/GroupMapper.xml	2 ●●●●● patch \| view \| raw \| blame \| history
	screen-job/screen-job.iml	152 ●●●●● patch \| view \| raw \| blame \| history
	screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java	8 ●●●●● patch \| view \| raw \| blame \| history

			@@ -12,6 +12,7 @@
			<module>screen-api</module>
			<module>myBatisPlusGenerator</module>
			<module>screen-manage</module>
			<module>screen-job</module>

			</modules>
			<packaging>pom</packaging>