hwj_system
/
scmy
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023-06-13 16:12:45 优化完善策略管理的增、删、改、查接口!

Browse Source
master
魔神煜修罗皇 2 years ago
parent 995def85af
commit faaf451f55
4 changed files with 60 additions and 45 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 25
      psdc-business/src/main/java/com/psdc/entity/vo/SceneVo.java
  2. 63
      psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java
  3. 4
      psdc-business/src/main/resources/mapper/business/PsdcSceneMapper.xml
  4. 11
      psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java

25
psdc-business/src/main/java/com/psdc/entity/vo/SceneVo.java
Unescape View File

@ -22,6 +22,16 @@ public class SceneVo {
private Long sceneCode;
/** 用户id */
private Long userId;
/** 是否有执行判断条件【0：没有;1：有】 */
private Integer isJudge ;
/** 判断条件设备Id */
private Integer judgeDevice ;
/** 判断条件设备的元素 */
private String judgeElement ;
/** 判断条件元素的数据值 */
private String judgeData ;
/** 设备id */
private Integer deviceId ;
/** 设备名称 */
@ -53,4 +63,19 @@ public class SceneVo {
this.sceneKey = sceneKey;
this.sceneValue = sceneValue;
}
public SceneVo(String sceneName, Long sceneCode, Long userId, Integer isJudge, Integer judgeDevice, String judgeElement, String judgeData, Integer deviceId, String sceneContext, String sceneKey, String sceneValue, String sceneRemark) {
this.sceneName = sceneName;
this.sceneCode = sceneCode;
this.userId = userId;
this.isJudge = isJudge;
this.judgeDevice = judgeDevice;
this.judgeElement = judgeElement;
this.judgeData = judgeData;
this.deviceId = deviceId;
this.sceneContext = sceneContext;
this.sceneKey = sceneKey;
this.sceneValue = sceneValue;
this.sceneRemark = sceneRemark;
}
}

63
psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java
Unescape View File

@ -57,36 +57,23 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
String userName = SecurityUtils.getUsername();
List<SceneVo> scenesList = new ArrayList<>();
for (DeviceVo dev : scenes.getDeviceVos()) {
// if (null != dev.getIntemp() && !"".equals(dev.getIntemp())) {
// SceneVo sceneVo;
// sceneVo = new SceneVo(scenes.getSceneName(), dev.getDeviceId(), "进水温度", "intemp", dev.getIntemp());
// scenesList.add(sceneVo);
// }
// if (null != dev.getOuttemp() && !"".equals(dev.getOuttemp())) {
// SceneVo sceneVo = new SceneVo(scenes.getSceneName(), dev.getDeviceId(), "出水温度", "outtemp", dev.getOuttemp());
// scenesList.add(sceneVo);
// }
// if (null != dev.getTemp() && !"".equals(dev.getTemp())) {
// SceneVo sceneVo = new SceneVo(scenes.getSceneName(), dev.getDeviceId(), "温度", "temp", dev.getTemp());
// scenesList.add(sceneVo);
// }
for (Map m : dev.getTempList()){
String desc = (String) m.get("label");
String tempValue = (String) m.get("value");
String sceneKey = psdcModelMapper.querySceneKeyByDesc(desc);
SceneVo sceneVo = new SceneVo(scenes.getSceneName(), dev.getDeviceId(), desc, sceneKey, tempValue);
String sceneKey = sceneKey(desc);
// SceneVo sceneVo = new SceneVo(scenes.getSceneName(), dev.getDeviceId(), desc, sceneKey, tempValue);
SceneVo sceneVo = new SceneVo(scenes.getSceneName(), timestamp, userId, scenes.getIsJudge(),
scenes.getJudgeDevice(), scenes.getJudgeElement(), scenes.getJudgeData(), dev.getDeviceId(),
desc, sceneKey, tempValue, scenes.getSceneRemark());
scenesList.add(sceneVo);
}
}
try {
for (SceneVo sc : scenesList) {
sc.setSceneCode(timestamp);
sc.setUserId(userId);
sc.setCreateBy(userName);
sc.setCreateTime(sdf.format(date));
sc.setSceneRemark(scenes.getSceneRemark());
}
psdcSceneMapper.InsertSceneData(scenesList);
return true;
@ -118,35 +105,21 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
String userName = sysUserMapper.selectUserById(userId).getUserName();
List<SceneVo> scenesList = new ArrayList<>();
for (DeviceVo dev : scenes.getDeviceVos()) {
// if (null != dev.getIntemp() && !"".equals(dev.getIntemp())) {
// SceneVo sceneVo;
// sceneVo = new SceneVo(scenes.getSceneName(), dev.getDeviceId(), "进水温度", "intemp", dev.getIntemp());
// scenesList.add(sceneVo);
// }
// if (null != dev.getOuttemp() && !"".equals(dev.getOuttemp())) {
// SceneVo sceneVo = new SceneVo(scenes.getSceneName(), dev.getDeviceId(), "出水温度", "outtemp", dev.getOuttemp());
// scenesList.add(sceneVo);
// }
// if (null != dev.getTemp() && !"".equals(dev.getTemp())) {
// SceneVo sceneVo = new SceneVo(scenes.getSceneName(), dev.getDeviceId(), "温度", "temp", dev.getTemp());
// scenesList.add(sceneVo);
// }
for (Map m : dev.getTempList()){
String desc = (String) m.get("label");
String tempValue = (String) m.get("value");
String sceneKey = psdcModelMapper.querySceneKeyByDesc(desc);
SceneVo sceneVo = new SceneVo(scenes.getSceneName(), dev.getDeviceId(), desc, sceneKey, tempValue);
String sceneKey = sceneKey(desc);
SceneVo sceneVo = new SceneVo(scenes.getSceneName(), scenes.getSceneCode(), userId, scenes.getIsJudge(),
scenes.getJudgeDevice(), scenes.getJudgeElement(), scenes.getJudgeData(), dev.getDeviceId(),
desc, sceneKey, tempValue, scenes.getSceneRemark());
scenesList.add(sceneVo);
}
}
try {
for (SceneVo sc : scenesList) {
sc.setSceneCode(scenes.getSceneCode());
sc.setUserId(userId);
sc.setCreateBy(userName);
sc.setCreateTime(sdf.format(date));
sc.setSceneRemark(scenes.getSceneRemark());
}
psdcSceneMapper.InsertSceneData(scenesList);
return true;
@ -197,7 +170,7 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
deviceVo.setDeviceName(sv.getDeviceName());
deviceVo.setDeviceSn(sv.getDeviceSn());
Map<String, Object> map = new HashMap<>();
map.put("label", sv.getSceneContext());
map.put("label", sv.getSceneKey());
map.put("value", sv.getSceneValue());
list.add(map);
deviceVo.setTempValue(list);
@ -215,14 +188,14 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
deviceVo.setDeviceSn(sv.getDeviceSn());
if (i == listByCode.size() - 1) {
Map<String, Object> map = new HashMap<>();
map.put("label", sv.getSceneContext());
map.put("label", sv.getSceneKey());
map.put("value", sv.getSceneValue());
list.add(map);
deviceVo.setTempValue(list);
ary.add(deviceVo);
} else {
Map<String, Object> map = new HashMap<>();
map.put("label", sv.getSceneContext());
map.put("label", sv.getSceneKey());
map.put("value", sv.getSceneValue());
list.add(map);
deviceVo.setTempValue(list);
@ -305,5 +278,17 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
return Long.valueOf(timestamp);
}
private String sceneKey(String desc){
String s = desc.substring(0,2);
switch (s){
case "开启":
return "open";
case "关闭":
return "close";
default:
return psdcModelMapper.querySceneKeyByDesc(desc);
}
}
}

4
psdc-business/src/main/resources/mapper/business/PsdcSceneMapper.xml
Unescape View File

@ -60,10 +60,10 @@
</insert>
<insert id="InsertSceneData" parameterType="com.psdc.entity.vo.SceneVo" useGeneratedKeys="true">
Insert into psdc_scene(scene_name,scene_code,user_id,device_id,device_sn,scene_context,scene_key,scene_value,scene_remark, create_by, create_time)
Insert into psdc_scene(scene_name,scene_code,user_id,device_id,device_sn,is_judge,judge_device,judge_element,judge_data,scene_context,scene_key,scene_value,scene_remark, create_by, create_time)
Values
<foreach collection="sceneRecord" item="entity" separator=",">
(#{entity.sceneName}, #{entity.sceneCode},#{entity.userId}, #{entity.deviceId}, #{entity.deviceSn}, #{entity.sceneContext}, #{entity.sceneKey}, #{entity.sceneValue},#{entity.sceneRemark},#{entity.createBy},#{entity.createTime})
(#{entity.sceneName}, #{entity.sceneCode},#{entity.userId}, #{entity.deviceId}, #{entity.deviceSn},#{entity.isJudge},#{entity.judgeDevice},#{entity.judgeElement},#{entity.judgeData}, #{entity.sceneContext}, #{entity.sceneKey}, #{entity.sceneValue},#{entity.sceneRemark},#{entity.createBy},#{entity.createTime})
</foreach>
</insert>

11
psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java
Unescape View File

@ -133,16 +133,21 @@ public class TotalElectricMeterController {
map2.put("deviceName", dev.getDeviceName());
List<ModelVo> modelVoList = psdcModelService.selDevIsControlByModelName(dd.getDeviceModel());
List<Map> ary = new ArrayList<>();
for (ModelVo scr : modelVoList){
Map<String, Object> content = new HashMap<>();
content.put("label", "控制启停");
content.put("value", "Start-Stop");
ary.add(content);
for (ModelVo scr : modelVoList){
content = new HashMap<>();
content.put("label", scr.getIoDesc());
content.put("value", scr.getRelationField());
ary.add(content);
}
map2.put("controlKey", ary);
if (ary.size() > 0){
maps2.add(map2);
}
// if (ary.size() > 0){
// maps2.add(map2);
// }
}
} else {
PsdcDevice dev = psdcDeviceService.queryById(dd.getDeviceId());

Write Preview
Loading…
Cancel
Save