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

Merge remote-tracking branch 'aa/master'

Browse Source
master
林颖晨 2 years ago
parent 9db2c4295a a932f249f8
commit 1756d70b04
4 changed files with 50 additions and 22 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. 4
      psdc-business/src/main/java/com/psdc/entity/vo/DeviceVo.java
  2. 1
      psdc-business/src/main/java/com/psdc/mapper/PsdcModelMapper.java
  3. 63
      psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java
  4. 4
      psdc-business/src/main/resources/mapper/business/PsdcModelMapper.xml

4
psdc-business/src/main/java/com/psdc/entity/vo/DeviceVo.java
Unescape View File

@ -5,6 +5,7 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
@ -35,4 +36,7 @@ public class DeviceVo {
private String temp ; private String temp ;
private Map tempValue; private Map tempValue;
private List<Map> tempList ;
} }

1
psdc-business/src/main/java/com/psdc/mapper/PsdcModelMapper.java
Unescape View File

@ -23,4 +23,5 @@ public interface PsdcModelMapper {
ModelVo queryControlModel(@Param("modelName") String modelName, ModelVo queryControlModel(@Param("modelName") String modelName,
@Param("modelKey") String modelKey); @Param("modelKey") String modelKey);
String querySceneKeyByDesc(@Param("ioDesc") String ioDesc);
} }

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

@ -5,6 +5,7 @@ import com.psdc.entity.request.PsdcSceneRequest;
import com.psdc.entity.res.PsdcSceneRes; import com.psdc.entity.res.PsdcSceneRes;
import com.psdc.entity.vo.DeviceVo; import com.psdc.entity.vo.DeviceVo;
import com.psdc.entity.vo.SceneVo; import com.psdc.entity.vo.SceneVo;
import com.psdc.mapper.PsdcModelMapper;
import com.psdc.mapper.PsdcSceneMapper; import com.psdc.mapper.PsdcSceneMapper;
import com.psdc.mapper.SysUserMapper; import com.psdc.mapper.SysUserMapper;
import com.psdc.service.IPsdcSceneService; import com.psdc.service.IPsdcSceneService;
@ -35,6 +36,9 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
@Resource @Resource
private SysUserMapper sysUserMapper; private SysUserMapper sysUserMapper;
@Resource
private PsdcModelMapper psdcModelMapper;
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@ -53,17 +57,25 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
String userName = sysUserMapper.selectUserById(userId).getUserName(); String userName = sysUserMapper.selectUserById(userId).getUserName();
List<SceneVo> scenesList = new ArrayList<>(); List<SceneVo> scenesList = new ArrayList<>();
for (DeviceVo dev : scenes.getDeviceVos()) { for (DeviceVo dev : scenes.getDeviceVos()) {
if (null != dev.getIntemp() && !"".equals(dev.getIntemp())) { // if (null != dev.getIntemp() && !"".equals(dev.getIntemp())) {
SceneVo sceneVo; // SceneVo sceneVo;
sceneVo = new SceneVo(scenes.getSceneName(), dev.getDeviceId(), "进水温度", "intemp", dev.getIntemp()); // sceneVo = new SceneVo(scenes.getSceneName(), dev.getDeviceId(), "进水温度", "intemp", dev.getIntemp());
scenesList.add(sceneVo); // scenesList.add(sceneVo);
} // }
if (null != dev.getOuttemp() && !"".equals(dev.getOuttemp())) { // if (null != dev.getOuttemp() && !"".equals(dev.getOuttemp())) {
SceneVo sceneVo = new SceneVo(scenes.getSceneName(), dev.getDeviceId(), "出水温度", "outtemp", dev.getOuttemp()); // SceneVo sceneVo = new SceneVo(scenes.getSceneName(), dev.getDeviceId(), "出水温度", "outtemp", dev.getOuttemp());
scenesList.add(sceneVo); // scenesList.add(sceneVo);
} // }
if (null != dev.getTemp() && !"".equals(dev.getTemp())) { // if (null != dev.getTemp() && !"".equals(dev.getTemp())) {
SceneVo sceneVo = new SceneVo(scenes.getSceneName(), dev.getDeviceId(), "温度", "temp", 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(), sceneKey, sceneKey, tempValue);
scenesList.add(sceneVo); scenesList.add(sceneVo);
} }
} }
@ -106,17 +118,24 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
String userName = sysUserMapper.selectUserById(userId).getUserName(); String userName = sysUserMapper.selectUserById(userId).getUserName();
List<SceneVo> scenesList = new ArrayList<>(); List<SceneVo> scenesList = new ArrayList<>();
for (DeviceVo dev : scenes.getDeviceVos()) { for (DeviceVo dev : scenes.getDeviceVos()) {
if (null != dev.getIntemp() && !"".equals(dev.getIntemp())) { // if (null != dev.getIntemp() && !"".equals(dev.getIntemp())) {
SceneVo sceneVo; // SceneVo sceneVo;
sceneVo = new SceneVo(scenes.getSceneName(), dev.getDeviceId(), "进水温度", "intemp", dev.getIntemp()); // sceneVo = new SceneVo(scenes.getSceneName(), dev.getDeviceId(), "进水温度", "intemp", dev.getIntemp());
scenesList.add(sceneVo); // scenesList.add(sceneVo);
} // }
if (null != dev.getOuttemp() && !"".equals(dev.getOuttemp())) { // if (null != dev.getOuttemp() && !"".equals(dev.getOuttemp())) {
SceneVo sceneVo = new SceneVo(scenes.getSceneName(), dev.getDeviceId(), "出水温度", "outtemp", dev.getOuttemp()); // SceneVo sceneVo = new SceneVo(scenes.getSceneName(), dev.getDeviceId(), "出水温度", "outtemp", dev.getOuttemp());
scenesList.add(sceneVo); // scenesList.add(sceneVo);
} // }
if (null != dev.getTemp() && !"".equals(dev.getTemp())) { // if (null != dev.getTemp() && !"".equals(dev.getTemp())) {
SceneVo sceneVo = new SceneVo(scenes.getSceneName(), dev.getDeviceId(), "温度", "temp", 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(), sceneKey, sceneKey, tempValue);
scenesList.add(sceneVo); scenesList.add(sceneVo);
} }
} }

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

@ -21,4 +21,8 @@
SELECT model_id,model_name,relation_field,io_desc,io_type FROM psdc_model SELECT model_id,model_name,relation_field,io_desc,io_type FROM psdc_model
WHERE model_name = #{modelName} And relation_field = #{modelKey} And io_type = "serve" WHERE model_name = #{modelName} And relation_field = #{modelKey} And io_type = "serve"
</select> </select>
<select id="querySceneKeyByDesc" resultType="java.lang.String">
Select relation_field From psdc_model WHERE io_desc = #{ioDesc} Group By relation_field
</select>
</mapper> </mapper>
Write Preview
Loading…
Cancel
Save