From 20bab3022c15a41b15a7a1ea27cc0059969a2be0 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 04 十二月 2020 15:42:33 +0800
Subject: [PATCH] 修改 主柜修改逻辑
---
src/main/java/com/nanometer/smartlab/service/SysControllerServiceImpl.java | 10 ++++++++++
src/main/webapp/sys_controller_mng.xhtml | 2 +-
src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml | 11 +++++++++++
src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.java | 3 +++
4 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.java b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.java
index 4dcecae..3dc280a 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.java
+++ b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.java
@@ -42,4 +42,7 @@
List<Map> getContainerPersonInCharge(String containerCode) throws DataAccessException;
Map selectLocationByContainerCode(String containerCode) throws DataAccessException;
+
+ void updateSysLabContainer(Map params);
+
}
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml
index 94a5ec8..9d61475 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml
@@ -40,6 +40,17 @@
where container_code = #{containerCode} and valid_flag = 1
</select>
+ <select id="updateSysLabContainer" parameterType="java.util.Map" >
+ update sys_laboratory_container slc
+ set slc.controller_code = #{code}
+ WHERE slc.controller_code = (
+ SELECT sc.controller_code
+ from sys_controller sc
+ WHERE sc.id = #{id}
+ and sc.valid_flag = 1)
+ and slc.valid_flag = 1
+ </select>
+
<select id="getSysLaboratoryContainerList" parameterType="java.util.Map" resultMap="SysLaboratoryContainer">
select su.*,ss.name as laboratoryName, ss.type as laboratoryType,sc.controller_name as controllerName from sys_laboratory_container as su
left join sys_laboratory as ss on su.laboratory_id = ss.id
diff --git a/src/main/java/com/nanometer/smartlab/service/SysControllerServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysControllerServiceImpl.java
index 01d13b4..5c8d3f2 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysControllerServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysControllerServiceImpl.java
@@ -6,6 +6,8 @@
import javax.annotation.Resource;
+import com.nanometer.smartlab.dao.SysLaboratoryContainerDao;
+import com.nanometer.smartlab.entity.SysLaboratoryContainer;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.springframework.dao.DataAccessException;
@@ -16,6 +18,7 @@
import com.nanometer.smartlab.exception.BusinessException;
import com.nanometer.smartlab.exception.ExceptionEnumCode;
import com.nanometer.smartlab.util.MessageUtil;
+import org.springframework.transaction.annotation.Transactional;
@Service("sysControllerService")
public class SysControllerServiceImpl implements SysControllerService {
@@ -23,6 +26,8 @@
private static Logger logger = Logger.getLogger(SysControllerServiceImpl.class);
@Resource(name = "sysControllerDao")
SysControllerDao sysControllerDao;
+ @Resource(name = "sysLaboratoryContainerDao")
+ SysLaboratoryContainerDao sysLaboratoryContainerDao;
@Override
public List<SysController> getAllControllerList() {
@@ -48,8 +53,13 @@
}
@Override
+ @Transactional
public int updateSysController(SysController sysController) {
try {
+ Map params = new HashMap();
+ params.put("id", sysController.getId());
+ params.put("code", sysController.getControllerCode());
+ sysLaboratoryContainerDao.updateSysLabContainer(params);
return this.sysControllerDao.updateSysControllerById(sysController);
} catch (DataAccessException e) {
logger.error(e.getMessage(), e);
diff --git a/src/main/webapp/sys_controller_mng.xhtml b/src/main/webapp/sys_controller_mng.xhtml
index a329e75..e267ac1 100644
--- a/src/main/webapp/sys_controller_mng.xhtml
+++ b/src/main/webapp/sys_controller_mng.xhtml
@@ -71,7 +71,7 @@
<p:inputText value="#{sysControllerMngController.controller.controllerName}"></p:inputText>
<p:outputLabel value="设备代码"></p:outputLabel>
- <p:inputText value="#{sysControllerMngController.controller.controllerCode}" readonly="true"></p:inputText>
+ <p:inputText value="#{sysControllerMngController.controller.controllerCode}"></p:inputText>
<p:outputLabel value="设备类型"></p:outputLabel>
<p:selectOneMenu value="#{sysControllerMngController.controller.type}"
required="true" requiredMessage="请选择设备类型">
--
Gitblit v1.9.2