From 19b72fbd2e6b30a23a06dd284619784a096bc896 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 26 Aug 2021 11:33:56 +0800
Subject: [PATCH] screen-manage 单位转换插入添加日志功能 修复organization插入Bug
---
screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java | 26 +-
screen-manage/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java | 3
screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java | 44 ++++
/dev/null | 24 --
screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationUpdateForm.java | 6
screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 7
screen-manage/src/main/java/com/moral/api/service/SensorService.java | 9 +
screen-manage/src/main/java/com/moral/api/service/SysDictDataService.java | 2
screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java | 324 +++++++++++++++++++-----------------
screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java | 49 -----
10 files changed, 244 insertions(+), 250 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationUpdateForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationUpdateForm.java
index b90948c..36908c1 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationUpdateForm.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationUpdateForm.java
@@ -67,9 +67,9 @@
ObjectUtils.isEmpty(areaCode) &&
ObjectUtils.isEmpty(locationLevelCode) &&
ObjectUtils.isEmpty(address) &&
- ObjectUtils.isEmpty(phone) &&
- ObjectUtils.isEmpty(email) &&
- ObjectUtils.isEmpty(wechat) &&
+ phone==null &&
+ email==null &&
+ wechat==null &&
ObjectUtils.isEmpty(expireTime)
)
return false;
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java
index 3057cb7..4b237ab 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java
@@ -34,6 +34,13 @@
private List<UnitConversionVO> unitConversions;
+ /**
+ * @Description: DTO������VO
+ * @Param: [dto]
+ * @return: com.moral.api.pojo.vo.unitConversion.UnitConversionQueryVO
+ * @Author: ���������
+ * @Date: 2021/8/26
+ */
public static UnitConversionQueryVO convert(UnitConversionQueryDTO dto) {
if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode())
return null;
@@ -56,6 +63,13 @@
return vo;
}
+ /**
+ * @Description: ������DTO������VO
+ * @Param: [dto]
+ * @return: com.moral.api.pojo.vo.unitConversion.UnitConversionVO
+ * @Author: ���������
+ * @Date: 2021/8/26
+ */
private static UnitConversionVO convertToQueryPage(UnitConversionDTO dto) {
UnitConversionVO vo = new UnitConversionVO();
UnitConversion unitConversion = dto.getUnitConversion();
@@ -69,16 +83,4 @@
return vo;
}
- /**
- * @Description: ������������������������������������������������������������������������
- * @Param: [formula]
- * @return: java.lang.String
- * @Author: ���������
- * @Date: 2021/5/12
- */
- public static String formulaConvert(String formula, String originalUnitName, String targetUnitName) {
- formula = formula.replace(Constants.FORMULA_PLACEHOLDER, originalUnitName);
- formula += "=" + targetUnitName;
- return formula;
- }
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/SensorService.java b/screen-manage/src/main/java/com/moral/api/service/SensorService.java
index 3ea51ff..f4509ea 100644
--- a/screen-manage/src/main/java/com/moral/api/service/SensorService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/SensorService.java
@@ -35,5 +35,14 @@
Map<String, Sensor> getAllSensorFromCache();
+ /**
+ * @Description: ������code������sensor������
+ * @Param: [code]
+ * @return: com.moral.api.entity.Sensor
+ * @Author: ���������
+ * @Date: 2021/8/26
+ */
+ Sensor getSensorByCode(String code);
+
void refreshCache();
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/SysDictDataService.java b/screen-manage/src/main/java/com/moral/api/service/SysDictDataService.java
index 7262fab..34d94a5 100644
--- a/screen-manage/src/main/java/com/moral/api/service/SysDictDataService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/SysDictDataService.java
@@ -30,7 +30,7 @@
SysDictDataDTO deleteData(SysDictDataDeleteForm form);
/**
- * @Description: ������������������
+ * @Description: ������������������
* @Param: [form]
* @return: com.moral.api.entity.sysDictData
* @Author: ���������
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
index d43de51..8b8c2f1 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
@@ -52,7 +52,6 @@
* @since 2021-03-09
*/
@Service
-@ConfigurationProperties(prefix = "log-aspect")
public class ManageAccountServiceImpl extends ServiceImpl<ManageAccountMapper, ManageAccount> implements ManageAccountService {
@@ -66,12 +65,6 @@
ManageAccountRoleMapper manageAccountRoleMapper;
@Autowired
LogUtils logUtils;
-
- Map<String, String> manageAccountFormMap;
-
- public void setManageAccountFormMap(Map<String, String> manageAccountFormMap) {
- this.manageAccountFormMap = manageAccountFormMap;
- }
/**
* @Description: ������������
@@ -375,48 +368,6 @@
accountDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
return accountDTO;
}
-
- /**
- * @Description: ���������������������������
- * @Param: [form, newAccount, oldAccount]
- * @return: void
- * @Author: ���������
- * @Date: 2021/4/8
- */
- private void insertUpdateLog(AccountUpdateForm updateForm, ManageAccount oldAccount) {
- //������������������
- HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
- StringBuilder content = new StringBuilder();
- content.append("������������������").append(oldAccount.getUserName() + ";")
- .append("������:" + oldAccount.getAccount() + ";");
- //������������Map,���������������������������������
- Map<String, Object> newParameters = JSONObject.parseObject(JSON.toJSONString(updateForm), Map.class);
- Map<String, Object> oldParameters = JSONObject.parseObject(JSON.toJSONString(oldAccount), Map.class);
- //������������������������Map���������������������������
- Set<String> keys = manageAccountFormMap.keySet();
- for (String key : keys) {
- String value = manageAccountFormMap.get(key);//���������������������
- if ("password".equals(key)) {//������������������������������������������
- if (!ObjectUtils.isEmpty(updateForm.getPassword())) {//���������������������������������
- content.append("���������������;");
- }
- } else {//������������������
- if (newParameters.get(key) != null) {
- String newValue = "���";
- String oldValue = "���";
- if (newParameters.get(key) != null && !newParameters.get(key).equals(" ")) {
- newValue = String.valueOf(newParameters.get(key));
- }
- if (oldParameters.get(key) != null && !oldParameters.get(key).equals(" ")) {
- oldValue = String.valueOf(oldParameters.get(key));
- }
- content.append(value + ":" + oldValue + "->" + newValue + ";");
- }
- }
- }
- logUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
- }
-
/**
* @Description: ������������������������
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java
index ce9f9a0..099046a 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java
@@ -272,7 +272,7 @@
* @Author: ���������
* @Date: 2021/5/13
*/
- public void combinationParentChildrenMenus(List<Menu> menus) {
+ private void combinationParentChildrenMenus(List<Menu> menus) {
//������menu������������
Map<Integer, Menu> menuMap = new HashMap<>();
for (Menu menu : menus) {
@@ -464,3 +464,4 @@
}
}
+
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
index 7dd0a4a..0aa31ac 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
@@ -50,7 +50,6 @@
* @since 2021-04-06
*/
@Service
-@ConfigurationProperties(prefix = "log-aspect")
public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Organization> implements OrganizationService {
@Autowired
@@ -67,12 +66,6 @@
@Autowired
MonitorPointService monitorPointService;
-
- Map<String, String> organizationFormMap;
-
- public void setOrganizationFormMap(Map<String, String> organizationFormMap) {
- this.organizationFormMap = organizationFormMap;
- }
/**
* @Description: ������������������
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
index c618490..dc7f819 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
@@ -33,7 +33,7 @@
/**
* <p>
- * ���������������
+ * ���������������
* </p>
*
* @author moral
@@ -64,35 +64,35 @@
@Override
@Transactional
public Map<String, Object> insertOne(Sensor sensor) {
- Map<String,Object> resultMap = new HashMap<>();
- if (sensor.getName()==null || sensor.getCode()==null){
- resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
- resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ Map<String, Object> resultMap = new HashMap<>();
+ if (sensor.getName() == null || sensor.getCode() == null) {
+ resultMap.put("code", ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg", ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
return resultMap;
}
QueryWrapper<Sensor> wrapper_name = new QueryWrapper<>();
- wrapper_name.eq("name",sensor.getName());
- wrapper_name.eq("is_delete","0");
- if (sensorMapper.selectCount(wrapper_name)!=0){
- resultMap.put("code",ResponseCodeEnum.SENSOR_IS_EXIST.getCode());
- resultMap.put("msg",ResponseCodeEnum.SENSOR_IS_EXIST.getMsg());
+ wrapper_name.eq("name", sensor.getName());
+ wrapper_name.eq("is_delete", "0");
+ if (sensorMapper.selectCount(wrapper_name) != 0) {
+ resultMap.put("code", ResponseCodeEnum.SENSOR_IS_EXIST.getCode());
+ resultMap.put("msg", ResponseCodeEnum.SENSOR_IS_EXIST.getMsg());
return resultMap;
}
QueryWrapper<Sensor> wrapper_code = new QueryWrapper<>();
- wrapper_code.eq("code",sensor.getCode());
- wrapper_code.eq("is_delete","0");
- if (sensorMapper.selectCount(wrapper_code)!=0){
- resultMap.put("code",ResponseCodeEnum.SENSOR_KEY_IS_USED.getCode());
- resultMap.put("msg",ResponseCodeEnum.SENSOR_KEY_IS_USED.getMsg());
+ wrapper_code.eq("code", sensor.getCode());
+ wrapper_code.eq("is_delete", "0");
+ if (sensorMapper.selectCount(wrapper_code) != 0) {
+ resultMap.put("code", ResponseCodeEnum.SENSOR_KEY_IS_USED.getCode());
+ resultMap.put("msg", ResponseCodeEnum.SENSOR_KEY_IS_USED.getMsg());
return resultMap;
}
sensorMapper.insertOne(sensor);
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
- String content = "������������:"+sensor.getName()+";";
- logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
- resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
- resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
+ String content = "������������:" + sensor.getName() + ";";
+ logUtils.saveOperationForManage(request, content, Constants.INSERT_OPERATE_TYPE);
+ resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
+ resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
//������������
refreshCache();
return resultMap;
@@ -100,201 +100,201 @@
@Override
@Transactional
- public Map<String, Object> updateSensor(Map<String,Object> updateSensorMap) {
- Map<String,Object> resultMap = new HashMap<>();
- if(ObjectUtils.isEmpty(updateSensorMap.get("id"))){
- resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
- resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ public Map<String, Object> updateSensor(Map<String, Object> updateSensorMap) {
+ Map<String, Object> resultMap = new HashMap<>();
+ if (ObjectUtils.isEmpty(updateSensorMap.get("id"))) {
+ resultMap.put("code", ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg", ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
return resultMap;
}
- if (updateSensorMap.get("name")==""){
- resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
- resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ if (updateSensorMap.get("name") == "") {
+ resultMap.put("code", ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg", ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
return resultMap;
}
- if(updateSensorMap.get("code")==""){
- resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
- resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ if (updateSensorMap.get("code") == "") {
+ resultMap.put("code", ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg", ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
return resultMap;
}
Sensor oldSensor = sensorMapper.getSensorById(Integer.parseInt(updateSensorMap.get("id").toString()));
- if (ObjectUtils.isEmpty(oldSensor)){
- resultMap.put("code",ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getCode());
- resultMap.put("msg",ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getMsg());
+ if (ObjectUtils.isEmpty(oldSensor)) {
+ resultMap.put("code", ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getCode());
+ resultMap.put("msg", ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getMsg());
return resultMap;
}
QueryWrapper<Sensor> wrapper_code = new QueryWrapper<>();
- wrapper_code.eq("code",updateSensorMap.get("code"));
- wrapper_code.eq("is_delete","0");
+ wrapper_code.eq("code", updateSensorMap.get("code"));
+ wrapper_code.eq("is_delete", "0");
List<Sensor> sensorList = sensorMapper.selectList(wrapper_code);
- if (sensorList.size()!=0&&!sensorList.get(0).getId().toString().equals(updateSensorMap.get("id").toString())){
- resultMap.put("code",ResponseCodeEnum.SENSOR_KEY_IS_USED.getCode());
- resultMap.put("msg",ResponseCodeEnum.SENSOR_KEY_IS_USED.getMsg());
+ if (sensorList.size() != 0 && !sensorList.get(0).getId().toString().equals(updateSensorMap.get("id").toString())) {
+ resultMap.put("code", ResponseCodeEnum.SENSOR_KEY_IS_USED.getCode());
+ resultMap.put("msg", ResponseCodeEnum.SENSOR_KEY_IS_USED.getMsg());
return resultMap;
}
sensorMapper.updateSensor(updateSensorMap);
- if (!ObjectUtils.isEmpty(updateSensorMap.get("code"))&&!oldSensor.getCode().equals(updateSensorMap.get("code"))){
+ if (!ObjectUtils.isEmpty(updateSensorMap.get("code")) && !oldSensor.getCode().equals(updateSensorMap.get("code"))) {
QueryWrapper<OrganizationUnitAlarm> wrapper_OUA = new QueryWrapper<>();
- wrapper_OUA.eq("is_delete",Constants.NOT_DELETE);
- wrapper_OUA.eq("sensor_code",oldSensor.getCode());
+ wrapper_OUA.eq("is_delete", Constants.NOT_DELETE);
+ wrapper_OUA.eq("sensor_code", oldSensor.getCode());
OrganizationUnitAlarm organizationUnitAlarm = new OrganizationUnitAlarm();
organizationUnitAlarm.setSensorCode(updateSensorMap.get("code").toString());
- organizationUnitAlarmMapper.update(organizationUnitAlarm,wrapper_OUA);
+ organizationUnitAlarmMapper.update(organizationUnitAlarm, wrapper_OUA);
}
//������deviceInfo������
CacheUtils.refreshDeviceAlarmInfo();
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
- String content = "������������:"+oldSensor.getName()+";";
- for (Object key:updateSensorMap.keySet()) {
- if (key.toString().equals("name")&&updateSensorMap.get(key)!=null){
- content = content+"���������:"+oldSensor.getName()+"->"+updateSensorMap.get(key)+";";
+ String content = "������������:" + oldSensor.getName() + ";";
+ for (Object key : updateSensorMap.keySet()) {
+ if (key.toString().equals("name") && updateSensorMap.get(key) != null) {
+ content = content + "���������:" + oldSensor.getName() + "->" + updateSensorMap.get(key) + ";";
}
- if (key.toString().equals("code")&&updateSensorMap.get(key)!=null){
+ if (key.toString().equals("code") && updateSensorMap.get(key) != null) {
/*QueryWrapper<VersionSensorUnit> wrapper_Version = new QueryWrapper<>();
wrapper_Version.eq("sensor_code",oldSensor.getCode());
wrapper_Version.eq("is_delete","0");
VersionSensorUnit versionSensorUnit = new VersionSensorUnit();
versionSensorUnit.setSensorCode(updateSensorMap.get(key).toString());
versionSensorUnitMapper.update(versionSensorUnit,wrapper_Version);*/
- content = content+"������:"+oldSensor.getCode()+"->"+updateSensorMap.get(key)+";";
+ content = content + "������:" + oldSensor.getCode() + "->" + updateSensorMap.get(key) + ";";
}
- if (key.toString().equals("desc")&&updateSensorMap.get(key)!=null){
- content = content+"������:"+oldSensor.getDesc()+"->"+updateSensorMap.get(key)+";";
+ if (key.toString().equals("desc") && updateSensorMap.get(key) != null) {
+ content = content + "������:" + oldSensor.getDesc() + "->" + updateSensorMap.get(key) + ";";
}
- if (key.toString().equals("upper")&&updateSensorMap.get(key)!=null){
- content = content+"������:"+oldSensor.getDesc()+"->"+updateSensorMap.get(key)+";";
+ if (key.toString().equals("upper") && updateSensorMap.get(key) != null) {
+ content = content + "������:" + oldSensor.getDesc() + "->" + updateSensorMap.get(key) + ";";
}
- if (key.toString().equals("lower")&&updateSensorMap.get(key)!=null){
- content = content+"������:"+oldSensor.getDesc()+"->"+updateSensorMap.get(key)+";";
+ if (key.toString().equals("lower") && updateSensorMap.get(key) != null) {
+ content = content + "������:" + oldSensor.getDesc() + "->" + updateSensorMap.get(key) + ";";
}
- if (key.toString().equals("default_unit_key")&&updateSensorMap.get(key)!=null){
- content = content+"������������:"+oldSensor.getDesc()+"->"+updateSensorMap.get(key)+";";
+ if (key.toString().equals("default_unit_key") && updateSensorMap.get(key) != null) {
+ content = content + "������������:" + oldSensor.getDesc() + "->" + updateSensorMap.get(key) + ";";
}
}
- logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
- resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
- resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
+ logUtils.saveOperationForManage(request, content, Constants.UPDATE_OPERATE_TYPE);
+ resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
+ resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
//������������
refreshCache();
return resultMap;
}
@Override
- public Map<String,Object> getAllSensor(Map map) {
- Map<String,Object> resultMap = new HashMap<>();
+ public Map<String, Object> getAllSensor(Map map) {
+ Map<String, Object> resultMap = new HashMap<>();
int current = Integer.parseInt(map.get("current").toString());
int size = Integer.parseInt(map.get("size").toString());
- Page<Sensor> page = new Page(current,size);
+ Page<Sensor> page = new Page(current, size);
QueryWrapper<Sensor> wrapper = new QueryWrapper();
- wrapper.eq("is_delete",0);
+ wrapper.eq("is_delete", 0);
int totleNum = sensorMapper.selectCount(wrapper);
- if (!ObjectUtils.isEmpty(map.get("orderType"))){
+ if (!ObjectUtils.isEmpty(map.get("orderType"))) {
String orderType = map.get("orderType").toString();
- if (orderType.equals(Constants.ORDER_DESC)){
+ if (orderType.equals(Constants.ORDER_DESC)) {
wrapper.orderByDesc("update_time");
- }else {
+ } else {
wrapper.orderByAsc("update_time");
}
}
- Page resultPage = sensorMapper.selectPage(page,wrapper);
+ Page resultPage = sensorMapper.selectPage(page, wrapper);
List<Sensor> sensors = resultPage.getRecords();
SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- List<Map<String,Object>> sensorList = new ArrayList<>();
- for (Sensor sensor:sensors) {
- Map sensorMap = JSON.parseObject(JSON.toJSONString(sensor),Map.class);
+ List<Map<String, Object>> sensorList = new ArrayList<>();
+ for (Sensor sensor : sensors) {
+ Map sensorMap = JSON.parseObject(JSON.toJSONString(sensor), Map.class);
String createTime = SDF.format(sensor.getCreateTime());
String updateTime = SDF.format(sensor.getUpdateTime());
- sensorMap.put("createTime",createTime);
- sensorMap.put("updateTime",updateTime);
- sensorMap.put("key",sensor.getId());
- if (sensor.getDefaultUnitKey()!=null&&sensor.getDefaultUnitKey()!=""){
+ sensorMap.put("createTime", createTime);
+ sensorMap.put("updateTime", updateTime);
+ sensorMap.put("key", sensor.getId());
+ if (sensor.getDefaultUnitKey() != null && sensor.getDefaultUnitKey() != "") {
QueryWrapper<SysDictData> wrapper_VSU = new QueryWrapper();
- wrapper_VSU.eq("is_delete",0);
- wrapper_VSU.eq("dataKey",sensor.getDefaultUnitKey());
- wrapper_VSU.eq("dict_type_id",14);
- if (!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU))&&!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU).getDataValue())){
- sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
+ wrapper_VSU.eq("is_delete", 0);
+ wrapper_VSU.eq("dataKey", sensor.getDefaultUnitKey());
+ wrapper_VSU.eq("dict_type_id", 14);
+ if (!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU)) && !ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU).getDataValue())) {
+ sensorMap.put("default_unit_key", sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
}
}
sensorList.add(sensorMap);
}
- resultMap.put("sensors",sensorList);
- resultMap.put("totalNumber",totleNum);
- resultMap.put("current",current);
- int totalPageNumber = totleNum/size;
- if(totleNum%size != 0){
+ resultMap.put("sensors", sensorList);
+ resultMap.put("totalNumber", totleNum);
+ resultMap.put("current", current);
+ int totalPageNumber = totleNum / size;
+ if (totleNum % size != 0) {
totalPageNumber += 1;
}
- resultMap.put("totalPageNumber",totalPageNumber);
+ resultMap.put("totalPageNumber", totalPageNumber);
return resultMap;
}
@Override
public Map<String, Object> getAllSensorWithoutPage() {
- Map<String,Object> resultMap = new HashMap<>();
+ Map<String, Object> resultMap = new HashMap<>();
QueryWrapper<Sensor> wrapper = new QueryWrapper();
- wrapper.eq("is_delete",0);
+ wrapper.eq("is_delete", 0);
List<Sensor> sensors = sensorMapper.selectList(wrapper);
SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- List<Map<String,Object>> sensorList = new ArrayList<>();
- for (Sensor sensor:sensors) {
- Map sensorMap = JSON.parseObject(JSON.toJSONString(sensor),Map.class);
+ List<Map<String, Object>> sensorList = new ArrayList<>();
+ for (Sensor sensor : sensors) {
+ Map sensorMap = JSON.parseObject(JSON.toJSONString(sensor), Map.class);
String createTime = SDF.format(sensor.getCreateTime());
String updateTime = SDF.format(sensor.getUpdateTime());
- sensorMap.put("createTime",createTime);
- sensorMap.put("updateTime",updateTime);
- sensorMap.put("key",sensor.getId());
- if (sensor.getDefaultUnitKey()!=null&&sensor.getDefaultUnitKey()!=""){
+ sensorMap.put("createTime", createTime);
+ sensorMap.put("updateTime", updateTime);
+ sensorMap.put("key", sensor.getId());
+ if (sensor.getDefaultUnitKey() != null && sensor.getDefaultUnitKey() != "") {
QueryWrapper<SysDictData> wrapper_VSU = new QueryWrapper();
- wrapper_VSU.eq("is_delete",0);
- wrapper_VSU.eq("dataKey",sensor.getDefaultUnitKey());
- wrapper_VSU.eq("dict_type_id",14);
- if (!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU))&&!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU).getDataValue())){
- sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
+ wrapper_VSU.eq("is_delete", 0);
+ wrapper_VSU.eq("dataKey", sensor.getDefaultUnitKey());
+ wrapper_VSU.eq("dict_type_id", 14);
+ if (!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU)) && !ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU).getDataValue())) {
+ sensorMap.put("default_unit_key", sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
}
}
sensorList.add(sensorMap);
}
- resultMap.put("sensors",sensorList);
+ resultMap.put("sensors", sensorList);
return resultMap;
}
@Override
@Transactional
public Map<String, Object> deleteSensor(Map map) {
- Map<String,Object> resultMap = new HashMap<>();
+ Map<String, Object> resultMap = new HashMap<>();
QueryWrapper<Sensor> wrapper = new QueryWrapper<>();
- wrapper.eq("id",map.get("id"));
- wrapper.eq("is_delete","0");
+ wrapper.eq("id", map.get("id"));
+ wrapper.eq("is_delete", "0");
Sensor sensor = sensorMapper.selectOne(wrapper);
- if(ObjectUtils.isEmpty(sensor)){
- resultMap.put("code",ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getCode());
- resultMap.put("msg",ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getMsg());
+ if (ObjectUtils.isEmpty(sensor)) {
+ resultMap.put("code", ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getCode());
+ resultMap.put("msg", ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getMsg());
return resultMap;
}
Sensor deleteSensor = new Sensor();
deleteSensor.setIsDelete(Constants.DELETE);
- sensorMapper.update(deleteSensor,wrapper);
+ sensorMapper.update(deleteSensor, wrapper);
QueryWrapper<VersionSensorUnit> wrapper_Version = new QueryWrapper<>();
- wrapper_Version.eq("sensor_code",sensor.getCode());
- wrapper_Version.eq("is_delete","0");
+ wrapper_Version.eq("sensor_code", sensor.getCode());
+ wrapper_Version.eq("is_delete", "0");
VersionSensorUnit versionSensorUnit = new VersionSensorUnit();
versionSensorUnit.setIsDelete(Constants.DELETE);
- versionSensorUnitMapper.update(versionSensorUnit,wrapper_Version);
- if (!ObjectUtils.isEmpty(sensor.getCode())&&!sensor.getCode().equals("")){
+ versionSensorUnitMapper.update(versionSensorUnit, wrapper_Version);
+ if (!ObjectUtils.isEmpty(sensor.getCode()) && !sensor.getCode().equals("")) {
QueryWrapper<OrganizationUnitAlarm> wrapper_OUA = new QueryWrapper<>();
- wrapper_OUA.eq("is_delete",Constants.NOT_DELETE);
- wrapper_OUA.eq("sensor_code",sensor.getCode());
+ wrapper_OUA.eq("is_delete", Constants.NOT_DELETE);
+ wrapper_OUA.eq("sensor_code", sensor.getCode());
OrganizationUnitAlarm organizationUnitAlarm = new OrganizationUnitAlarm();
organizationUnitAlarm.setIsDelete(Constants.DELETE);
- organizationUnitAlarmMapper.update(organizationUnitAlarm,wrapper_OUA);
+ organizationUnitAlarmMapper.update(organizationUnitAlarm, wrapper_OUA);
}
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
- String content = "������������:"+sensor.getName()+";";
- logUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
- resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
- resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
+ String content = "������������:" + sensor.getName() + ";";
+ logUtils.saveOperationForManage(request, content, Constants.DELETE_OPERATE_TYPE);
+ resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
+ resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
//������������
refreshCache();
//������token
@@ -304,82 +304,100 @@
@Override
public Map<String, Object> getSensorByFuzzy(Map map) {
- Map<String,Object> resultMap = new HashMap<>();
+ Map<String, Object> resultMap = new HashMap<>();
int current = Integer.parseInt(map.get("current").toString());
int size = Integer.parseInt(map.get("size").toString());
- Page<Sensor> page = new Page(current,size);
+ Page<Sensor> page = new Page(current, size);
QueryWrapper<Sensor> wrapper = new QueryWrapper();
- wrapper.eq("is_delete",Constants.NOT_DELETE);
- wrapper.like("name",map.get("key")).or().like("code",map.get("key"));
+ wrapper.eq("is_delete", Constants.NOT_DELETE);
+ wrapper.like("name", map.get("key")).or().like("code", map.get("key"));
int totleNum = sensorMapper.selectCount(wrapper);
String orderType = map.get("orderType").toString();
- if (orderType.equals(Constants.ORDER_ASC)){
+ if (orderType.equals(Constants.ORDER_ASC)) {
wrapper.orderByAsc("update_time");
- }else {
+ } else {
wrapper.orderByDesc("update_time");
}
- Page resultPage = sensorMapper.selectPage(page,wrapper);
+ Page resultPage = sensorMapper.selectPage(page, wrapper);
List<Sensor> sensors = resultPage.getRecords();
SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- List<Map<String,Object>> sensorList = new ArrayList<>();
- for (Sensor sensor:sensors) {
- Map sensorMap = JSON.parseObject(JSON.toJSONString(sensor),Map.class);
+ List<Map<String, Object>> sensorList = new ArrayList<>();
+ for (Sensor sensor : sensors) {
+ Map sensorMap = JSON.parseObject(JSON.toJSONString(sensor), Map.class);
String createTime = SDF.format(sensor.getCreateTime());
String updateTime = SDF.format(sensor.getUpdateTime());
- sensorMap.put("createTime",createTime);
- sensorMap.put("updateTime",updateTime);
- sensorMap.put("key",sensor.getId());
- if (sensor.getDefaultUnitKey()!=null&&!sensor.getDefaultUnitKey().equals("")){
+ sensorMap.put("createTime", createTime);
+ sensorMap.put("updateTime", updateTime);
+ sensorMap.put("key", sensor.getId());
+ if (sensor.getDefaultUnitKey() != null && !sensor.getDefaultUnitKey().equals("")) {
QueryWrapper<SysDictData> wrapper_VSU = new QueryWrapper();
- wrapper_VSU.eq("is_delete",0);
- wrapper_VSU.eq("dataKey",sensor.getDefaultUnitKey());
- wrapper_VSU.eq("dict_type_id",14);
- sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
+ wrapper_VSU.eq("is_delete", 0);
+ wrapper_VSU.eq("dataKey", sensor.getDefaultUnitKey());
+ wrapper_VSU.eq("dict_type_id", 14);
+ sensorMap.put("default_unit_key", sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
}
sensorList.add(sensorMap);
}
- resultMap.put("sensors",sensorList);
- resultMap.put("totalNumber",totleNum);
- resultMap.put("current",current);
- int totalPageNumber = totleNum/size;
- if(totleNum%size != 0){
+ resultMap.put("sensors", sensorList);
+ resultMap.put("totalNumber", totleNum);
+ resultMap.put("current", current);
+ int totalPageNumber = totleNum / size;
+ if (totleNum % size != 0) {
totalPageNumber += 1;
}
- resultMap.put("totalPageNumber",totalPageNumber);
+ resultMap.put("totalPageNumber", totalPageNumber);
return resultMap;
}
@Override
- public Map<String,Sensor> getAllSensorFromCache(){
- Map<String,Sensor> sensors = redisTemplate.opsForHash().entries(RedisConstants.SENSOR_KEY);
- if(ObjectUtils.isEmpty(sensors))
- sensors = getAllSensorFromDB();
+ public Map<String, Sensor> getAllSensorFromCache() {
+ Map<String, Sensor> sensors = redisTemplate.opsForHash().entries(RedisConstants.SENSOR_KEY);
+ if (ObjectUtils.isEmpty(sensors))
+ sensors = getAllSensorFromDB();
//������������
refreshCache(sensors);
return sensors;
}
@Override
- public void refreshCache(){
+ public Sensor getSensorByCode(String code) {
+ if (code == null)
+ return null;
+ //������������������
+ Sensor sensor = (Sensor) redisTemplate.opsForHash().get(RedisConstants.SENSOR_KEY, code);
+ //���������������������������������������
+ if (sensor == null) {
+ QueryWrapper<Sensor> wrapper = new QueryWrapper<>();
+ sensor = new Sensor();
+ sensor.setCode(code);
+ sensor.setIsDelete(Constants.NOT_DELETE);
+ wrapper.setEntity(sensor);
+ sensor = sensorMapper.selectOne(wrapper);
+ }
+ return sensor;
+ }
+
+ @Override
+ public void refreshCache() {
Map<String, Sensor> sensors = getAllSensorFromDB();
refreshCache(sensors);
}
- private Map<String,Sensor> getAllSensorFromDB(){
+ private Map<String, Sensor> getAllSensorFromDB() {
QueryWrapper<Sensor> wrapper = new QueryWrapper<>();
- wrapper.eq("is_delete",Constants.NOT_DELETE);
+ wrapper.eq("is_delete", Constants.NOT_DELETE);
List<Sensor> sensors = sensorMapper.selectList(wrapper);
- Map<String,Sensor> result = new HashMap<>();
+ Map<String, Sensor> result = new HashMap<>();
for (Sensor sensor : sensors) {
- result.put(sensor.getCode(),sensor);
+ result.put(sensor.getCode(), sensor);
}
return result;
}
- private void refreshCache(Map<String,Sensor> sensors){
+ private void refreshCache(Map<String, Sensor> sensors) {
//������������
redisTemplate.delete(RedisConstants.SENSOR_KEY);
//������������
- redisTemplate.opsForHash().putAll(RedisConstants.SENSOR_KEY,sensors);
+ redisTemplate.opsForHash().putAll(RedisConstants.SENSOR_KEY, sensors);
}
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java
index 0e40019..1a73868 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.config.mybatis.wrapper.NullFilterWrapper;
+import com.moral.api.entity.Sensor;
import com.moral.api.entity.SysDictData;
import com.moral.api.entity.UnitConversion;
import com.moral.api.mapper.UnitConversionMapper;
@@ -14,9 +15,11 @@
import com.moral.api.pojo.form.unitConversion.UnitConversionInsertForm;
import com.moral.api.pojo.form.unitConversion.UnitConversionQueryForm;
import com.moral.api.pojo.form.unitConversion.UnitConversionUpdateForm;
+import com.moral.api.service.SensorService;
import com.moral.api.service.SysDictDataService;
import com.moral.api.service.UnitConversionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.constant.ResponseCodeEnum;
@@ -48,6 +51,11 @@
SysDictDataService sysDictDataService;
@Autowired
RedisTemplate redisTemplate;
+ @Autowired
+ LogUtils logUtils;
+ @Autowired
+ SensorService sensorService;
+
@Override
@Transactional
@@ -82,6 +90,8 @@
unitConversionMapper.insert(unitConversion);
//������������
refreshCache();
+ //������������
+ insertLog(unitConversion);
//������������������
dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
@@ -168,6 +178,7 @@
}
@Override
+ @Transactional
public UnitConversionDTO deleteUnitConversion(UnitConversionDeleteForm form) {
//������������������
UnitConversionDTO dto = new UnitConversionDTO();
@@ -203,4 +214,37 @@
if(!ObjectUtils.isEmpty(unitConversions))
redisTemplate.opsForList().leftPushAll(RedisConstants.UNIT_CONVERSION,unitConversions);
}
+
+ /**
+ * @Description: ������������������������
+ * @Param: [unitConversion]
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/8/26
+ */
+ private void insertLog(UnitConversion unitConversion){
+ //������������������������
+ Map<String, SysDictData> units = sysDictDataService.getDictDatasByType("unit");
+ String originalUnitKey = unitConversion.getOriginalUnitKey();
+ String targetUnitKey = unitConversion.getTargetUnitKey();
+ SysDictData originalData = units.get(originalUnitKey);
+ SysDictData targetData = units.get(targetUnitKey);
+ String formula = unitConversion.getFormula();
+ //������������������
+ formula = formula.replace(Constants.FORMULA_PLACEHOLDER, "���������");
+ formula = "������������"+" = "+formula;
+ String sensorCode = unitConversion.getSensorCode();
+ StringBuilder content = new StringBuilder();
+ content.append("���������������������������;");
+ content.append("������������"+originalData.getDataValue()+";");
+ content.append("���������������"+targetData.getDataValue()+";");
+ content.append("���������������"+formula+";");
+ if(sensorCode!=null){
+ Sensor sensor = sensorService.getSensorByCode(sensorCode);
+ if(sensor!=null)
+ content.append("���������������"+sensor.getName()+";");
+ }
+
+ logUtils.saveOperationForManage(content.toString(),Constants.INSERT_OPERATE_TYPE);
+ }
}
diff --git a/screen-manage/src/main/resources/application-moduleFormColumn.yml b/screen-manage/src/main/resources/application-moduleFormColumn.yml
deleted file mode 100644
index 1faddd1..0000000
--- a/screen-manage/src/main/resources/application-moduleFormColumn.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-#���������������������������������������������������������������������������
-log-aspect:
- organization-form-map:
- parentName: ���������
- name: ������
- provinceName: ������
- cityName: ������
- areaName: ������
- locationLevelName: ������������
- address: ������
- phone: ������
- email: ������
- wechat: ������
- expireTime: ������������
- manage-account-form-map:
- userName: ������
- password: ������
- email: ������
- mobile: ���������
- wechat: ������
- roleIds: ������
-
-
-
--
Gitblit v1.8.0