src/main/java/com/moral/mapper/DictionaryDataMapper.java
@@ -4,5 +4,5 @@ import com.moral.entity.DictionaryData; public interface DictionaryDataMapper extends BaseMapper<DictionaryData> { DictionaryData selectByPrimaryKey(Integer id); // DictionaryData selectByPrimaryKey(Integer id); } src/main/java/com/moral/mapper/DictionaryMapper.java
@@ -4,5 +4,5 @@ import com.moral.entity.Dictionary; public interface DictionaryMapper extends BaseMapper<Dictionary> { Dictionary selectByPrimaryKey(String dictName); // Dictionary selectByPrimaryKey(String dictName); } src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -211,7 +211,9 @@ if(!StringUtils.isBlank(device.getMac())){ Device simpleDevice = new Device(); simpleDevice.setId(device.getId()); simpleDevice.setDeviceVersion(device.getDeviceVersion()); simpleDevice.setName(device.getName()); simpleDevice.setAddress(device.getAddress()); simpleDevice.setDeviceVersionId(device.getDeviceVersionId()); simpleDevice.setMac(device.getMac()); simpleDevice.setMonitorPointId(device.getMonitorPointId()); if(device.getMonitorPointId()!=null){ src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
@@ -44,6 +44,7 @@ } @Override public List<MonitorPoint> queryWithStateByMap(Map<String, Object> params){ params.put("isDelete",Constants.IS_DELETE_FALSE); List<MonitorPoint> monitorPointList = monitorPointMapper.selectByMap(params); for(MonitorPoint monitorPoint:monitorPointList){ Integer state = getStateFromRedis(monitorPoint.getId()); src/main/resources/mapper/MonitorPointMapper.xml
@@ -113,6 +113,9 @@ AND mpt.latitude < #{mapBounds.Fe,jdbcType=NUMERIC} AND mpt.latitude > #{mapBounds.Ke,jdbcType=NUMERIC} ]]> <if test="isDelete != null"> AND mpt.is_delete = #{isDelete,jdbcType=VARCHAR} </if> </where> </select> <select id="selectOrganizationIds" parameterType="integer" resultType="integer">