screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java
@@ -46,4 +46,16 @@ return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString()); } @RequestMapping(value = "updateOneDeviceAdjustValue", method = RequestMethod.POST) @ResponseBody public ResultMessage updateOneDeviceAdjustValue(@RequestBody Map<String, Object> parameters) { Map<String,Object> resultMap = deviceAdjustValueService.updateOne(parameters); String msg = resultMap.get("msg").toString(); int code = Integer.parseInt(resultMap.get("code").toString()); if (code == 0){ return ResultMessage.ok(msg); } return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString()); } } screen-manage/src/main/java/com/moral/api/entity/DeviceAdjustValue.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; import java.io.Serializable; import java.sql.Time; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; @@ -36,16 +37,14 @@ /** * 开始时间 */ @DateTimeFormat(pattern = "HH:mm") @JsonFormat(pattern = "HH:mm",timezone = "GMT+8") private Date startTime; @DateTimeFormat(pattern = "HH:mm:ss") @JsonFormat(pattern = "HH:mm:ss",timezone = "GMT+8") private Time startTime; /** * 结束时间 */ @DateTimeFormat(pattern = "HH:mm") @JsonFormat(pattern = "HH:mm",timezone = "GMT+8") private Date endTime; private Time endTime; /** * 传感器 screen-manage/src/main/java/com/moral/api/mapper/DeviceAdjustValueMapper.java
@@ -3,6 +3,8 @@ import com.moral.api.entity.DeviceAdjustValue; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.Map; /** * <p> * Mapper 接口 @@ -13,4 +15,6 @@ */ public interface DeviceAdjustValueMapper extends BaseMapper<DeviceAdjustValue> { void updateDeviceAdjustValue(Map map); } screen-manage/src/main/java/com/moral/api/service/DeviceAdjustValueService.java
@@ -22,4 +22,7 @@ Map<String,Object> getDataByCondition(Map map); @Transactional Map<String,Object> updateOne(Map map); } screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
@@ -22,6 +22,7 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; import java.sql.Time; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -117,6 +118,10 @@ List<Map<String,Object>> deviceAdjustValueList = new ArrayList<>(); for (DeviceAdjustValue deviceAdjustValue:deviceAdjustValues) { Map deviceAdjustValueMap = JSON.parseObject(JSON.toJSONString(deviceAdjustValue),Map.class); Time startTime = new Time(Long.valueOf(Long.parseLong(deviceAdjustValueMap.get("startTime").toString()))); deviceAdjustValueMap.put("startTime",new Time(startTime.getTime())); Time endTime = new Time(Long.valueOf(Long.parseLong(deviceAdjustValueMap.get("endTime").toString()))); deviceAdjustValueMap.put("endTime",new Time(endTime.getTime())); deviceAdjustValueList.add(deviceAdjustValueMap); } resultMap.put("deviceAdjustValues",deviceAdjustValueList); @@ -132,4 +137,34 @@ return resultMap; } @Override public Map<String, Object> updateOne(Map map) { Map<String,Object> resultMap = new HashMap<>(); if (ObjectUtils.isEmpty(map.get("id"))||map.get("id").equals("")){ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode()); resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); return resultMap; } DeviceAdjustValue deviceAdjustValueOld = deviceAdjustValueMapper.selectById(Integer.parseInt(map.get("id").toString())); deviceAdjustValueMapper.updateDeviceAdjustValue(map); //操作插入日志 HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String content = "修改了"+deviceAdjustValueOld.getMac()+"设备"+deviceAdjustValueOld.getSensorCode()+"传感器的校准信息:"+";"; for (Object key:map.keySet()) { if (key.toString().equals("start_time")&&map.get(key)!=null){ content = content+"开始时间:"+deviceAdjustValueOld.getStartTime()+"->"+map.get(key)+";"; } if (key.toString().equals("end_time")&&map.get(key)!=null){ content = content+"结束时间:"+deviceAdjustValueOld.getEndTime()+"->"+map.get(key)+";"; } if (key.toString().equals("value")&&map.get(key)!=null){ content = content+"校准公式:"+deviceAdjustValueOld.getValue()+"->"+map.get(key)+";"; } } logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE); resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode()); resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg()); return resultMap; } } screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml
@@ -5,7 +5,7 @@ <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.moral.api.entity.DeviceAdjustValue"> <id column="id" property="id" /> <result column="device_id" property="deviceId" /> <result column="mac" property="mac" /> <result column="start_time" property="startTime" /> <result column="end_time" property="endTime" /> <result column="sensor_code" property="sensorCode" /> @@ -15,4 +15,30 @@ <result column="is_delete" property="isDelete" /> </resultMap> <sql id="Base_Column_List"> das.id,das.mac,das.start_time,das.end_time,das.sensor_code,das.value,das.create_time,das.update_time,das.is_delete </sql> <update id="updateDeviceAdjustValue" parameterType="java.util.Map"> update device_adjust_value <set> <if test="mac != null"> name = #{mac}, </if> <if test="start_time != null"> start_time = #{start_time}, </if> <if test="end_time != null"> end_time = #{end_time}, </if> <if test="value != null"> value = #{value}, </if> <if test="is_delete != null"> is_delete = #{is_delete}, </if> </set> where id = #{id} </update> </mapper>
