From 4bc9778d38fd3793d7c349b91368dc76af27ccc9 Mon Sep 17 00:00:00 2001 From: "yan.y" Date: Thu, 18 Sep 2025 15:01:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD=E5=8F=8A?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ifish/action/AdminAction.java | 247 +++++++++++++++++- .../java/com/ifish/dao/FactoryListDao.java | 6 + .../java/com/ifish/dao/HardwareVenderDao.java | 12 + .../com/ifish/daoImpl/FactoryListDaoImpl.java | 12 +- .../com/ifish/daoImpl/HardwareVenderImpl.java | 19 ++ .../com/ifish/domain/FactoryVenderData.java | 38 +++ .../FactoryVenderHardwareTypeAttri.java | 10 + .../java/com/ifish/entity/HardwareVender.java | 121 +++++++++ .../java/com/ifish/entity/VenderList.java | 11 +- .../java/com/ifish/search/SearchFilter.java | 11 +- .../java/com/ifish/service/AdminService.java | 15 +- .../ifish/serviceImpl/AdminServiceImpl.java | 149 +++++++++-- src/main/resources/application-security.xml | 8 +- .../WEB-INF/view/roleAdmin/addFactory.jsp | 12 +- .../WEB-INF/view/roleAdmin/addFactory1.jsp | 127 +++++++++ .../WEB-INF/view/roleAdmin/addVender.jsp | 9 + .../WEB-INF/view/roleAdmin/editFactory.jsp | 5 +- .../WEB-INF/view/roleAdmin/editFactory1.jsp | 135 ++++++++++ .../view/roleAdmin/editHardwareTypeAttr.jsp | 93 +++++-- .../WEB-INF/view/roleAdmin/editVender.jsp | 9 + .../WEB-INF/view/roleAdmin/factoryList1.jsp | 139 ++++++++++ .../view/roleAdmin/hardwareTypeList.jsp | 7 - .../WEB-INF/view/roleAdmin/venderList.jsp | 8 + 23 files changed, 1134 insertions(+), 69 deletions(-) create mode 100644 src/main/java/com/ifish/dao/HardwareVenderDao.java create mode 100644 src/main/java/com/ifish/daoImpl/HardwareVenderImpl.java create mode 100644 src/main/java/com/ifish/domain/FactoryVenderData.java create mode 100644 src/main/java/com/ifish/entity/HardwareVender.java create mode 100644 src/main/webapp/WEB-INF/view/roleAdmin/addFactory1.jsp create mode 100644 src/main/webapp/WEB-INF/view/roleAdmin/editFactory1.jsp create mode 100644 src/main/webapp/WEB-INF/view/roleAdmin/factoryList1.jsp diff --git a/src/main/java/com/ifish/action/AdminAction.java b/src/main/java/com/ifish/action/AdminAction.java index 139fff4..daaea97 100644 --- a/src/main/java/com/ifish/action/AdminAction.java +++ b/src/main/java/com/ifish/action/AdminAction.java @@ -1,6 +1,9 @@ package com.ifish.action; import com.alibaba.fastjson.JSONObject; +import com.ifish.dao.HardwareTypeAttriDao; +import com.ifish.dao.HardwareVenderDao; +import com.ifish.domain.FactoryVenderData; import com.ifish.domain.JsonResult; import com.ifish.entity.*; import com.ifish.enums.*; @@ -17,9 +20,12 @@ import com.ifish.util.ResultUtil; import com.ifish.webService.MyService; import com.ifish.webService.MyServiceService; import org.apache.commons.lang3.StringUtils; +import org.hibernate.criterion.Restrictions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.ui.ModelMap; @@ -29,6 +35,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; +import javax.annotation.Resource; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.*; @@ -515,7 +522,20 @@ public class AdminAction { @ResponseBody public Object venderListInf(SearchFilter searchFilter) { try { + UserDetails userDetails = (UserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); + SecurityUser securityUser = adminService.getSysUserByUserName(userDetails.getUsername()); + String code = securityUser.getCode(); + if (!securityUser.getRole().equals("ROLE_ADMIN")) { + searchFilter.setFactoryCode(code); + } Pagination page = this.adminService.getVenderListByPage(searchFilter); + if (!securityUser.getRole().equals("ROLE_ADMIN")) { + List factoryVenderData = this.adminService.getFactoryBrandList(); + for (VenderList venderList : page.getList()) { + Optional optionalVenderList = factoryVenderData.stream().filter(f -> f.getBrand_code().equals(venderList.getBrandCode())).findFirst(); + optionalVenderList.ifPresent(list -> venderList.setBackground(list.getBackground())); + } + } return IfishUtil.returnPageData(page, searchFilter.getsEcho()); } catch (Exception e) { log.error("get venderList page information:error message:{}", e.toString()); @@ -576,10 +596,15 @@ public class AdminAction { * @return */ @RequestMapping("/updateVender.do") - public ModelAndView updateVender(VenderList venderList, String base64) { + public ModelAndView updateVender(VenderList venderList, String base64 ,MultipartFile fileUpload) { Map map = new HashMap(); map.put("venderList", venderList); try { + if (fileUpload != null) { + String newImgName = System.currentTimeMillis() +".png"; + IfishFileUtils.uploadFile(IfishFileDirectory.path_img_goods,newImgName,fileUpload); + venderList.setBackground(newImgName); + } String status = this.adminService.UpdateVender(venderList, base64); map.put("status", status); if (status.equals(SysUserEnum.success100.getKey())) { @@ -889,6 +914,12 @@ public class AdminAction { @ResponseBody public Object hardwareTypeInf(SearchFilter searchFilter) { try { + UserDetails userDetails = (UserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); + SecurityUser securityUser = adminService.getSysUserByUserName(userDetails.getUsername()); + String code = securityUser.getCode(); + if (!securityUser.getRole().equals("ROLE_ADMIN")) { + searchFilter.setFactoryCode(code); + } Pagination page = this.adminService.getHardwareTypeByPage(searchFilter); return IfishUtil.returnPageData(page, searchFilter.getsEcho()); } catch (Exception e) { @@ -919,6 +950,7 @@ public class AdminAction { deviceAttr1List.add(new CheckNames("12", "S12开关", false)); List deviceAttr3List = new ArrayList<>(); + deviceAttr3List.add(new CheckNames("13", "加热制冷模式", false)); deviceAttr3List.add(new CheckNames("25", "加热模式温度设置", false)); deviceAttr3List.add(new CheckNames("26", "制冷模式温度设置", false)); deviceAttr3List.add(new CheckNames("27", "喂鱼设置", false)); @@ -982,6 +1014,7 @@ public class AdminAction { deviceAttr1List.add(new CheckNames("11", "S11开关", hasAttr && hardwareTypeAttri.getSwitchS11() == 1)); deviceAttr1List.add(new CheckNames("12", "S12开关", hasAttr && hardwareTypeAttri.getSwitchS12() == 1)); List deviceAttr3List = new ArrayList<>(); + deviceAttr3List.add(new CheckNames("13", "加热制冷模式", hasAttr && hardwareTypeAttri.getHeatingSet() == 1)); deviceAttr3List.add(new CheckNames("25", "加热模式温度设置", hasAttr && hardwareTypeAttri.getTemperature1() == 1)); deviceAttr3List.add(new CheckNames("26", "制冷模式温度设置", hasAttr && hardwareTypeAttri.getTemperature2() == 1)); deviceAttr3List.add(new CheckNames("27", "喂鱼设置", hasAttr && hardwareTypeAttri.getFeedfishSet() == 1)); @@ -1002,6 +1035,8 @@ public class AdminAction { return new ModelAndView("redirect:/page/admin/hardwareTypeList.do"); } + @Resource + private HardwareTypeAttriDao hardwareTypeAttriDao; /** * 更新硬件设备默认名称 @@ -1009,14 +1044,19 @@ public class AdminAction { * @return */ @RequestMapping("/doUpdateHardwareAttr.do") - public ModelAndView doUpdateHardwareAttr(String hardwareType) { + public ModelAndView doUpdateHardwareAttr(String hardwareType,String venderCode) { if (hardwareType != null) { - FactoryVenderHardwareTypeAttri factoryVenderHardwareTypeAttri = this.adminService.getFactoryVenderHardwareTypeAttri(hardwareType); - Map map = new HashMap(); + FactoryVenderHardwareTypeAttri factoryVenderHardwareTypeAttri = this.adminService.getFactoryVenderHardwareTypeAttri(hardwareType, venderCode); + Map map = new HashMap<>(); if (factoryVenderHardwareTypeAttri == null) { factoryVenderHardwareTypeAttri = new FactoryVenderHardwareTypeAttri(); factoryVenderHardwareTypeAttri.setHardwareType(hardwareType); } + HardwareTypeAttri hardwareTypeAttri = hardwareTypeAttriDao.findUniqueByProperty(Restrictions.eq("hardwareType", hardwareType)); + if (hardwareTypeAttri == null) { + hardwareTypeAttri = new HardwareTypeAttri(); + } + map.put("hardwareTypeAttrSwitch", hardwareTypeAttri); map.put("hardwareTypeAttr", factoryVenderHardwareTypeAttri); return new ModelAndView("roleAdmin/editHardwareTypeAttr", map); } @@ -1043,7 +1083,7 @@ public class AdminAction { @RequestParam("fileUpload11") MultipartFile fileUpload11, @RequestParam("fileUpload12") MultipartFile fileUpload12) throws IOException { if (factoryVenderHardwareTypeAttriForm.getHardwareType() != null) { - FactoryVenderHardwareTypeAttri factoryVenderHardwareTypeAttri = this.adminService.getFactoryVenderHardwareTypeAttri(factoryVenderHardwareTypeAttriForm.getHardwareType()); + FactoryVenderHardwareTypeAttri factoryVenderHardwareTypeAttri = this.adminService.getFactoryVenderHardwareTypeAttri(factoryVenderHardwareTypeAttriForm.getHardwareType(), factoryVenderHardwareTypeAttriForm.getVenderCode()); if (factoryVenderHardwareTypeAttri == null) { factoryVenderHardwareTypeAttri = new FactoryVenderHardwareTypeAttri(); factoryVenderHardwareTypeAttri.setHardwareType(factoryVenderHardwareTypeAttriForm.getHardwareType()); @@ -1146,7 +1186,7 @@ public class AdminAction { } this.adminService.saveFactoryHardwareTypeAttr(factoryVenderHardwareTypeAttri); } - return new ModelAndView("redirect:/page/admin/hardwareTypeList.do"); + return new ModelAndView("redirect:/page/admin/factoryList1.do"); } /** @@ -1381,6 +1421,16 @@ public class AdminAction { return new ModelAndView("roleAdmin/factoryList"); } + /** + * 电子厂信息 + * + * @return + */ + @RequestMapping("/factoryList1.do") + public ModelAndView factoryList1() { + return new ModelAndView("roleAdmin/factoryList1"); + } + /** * 电子厂信息列表 * @@ -1394,6 +1444,12 @@ public class AdminAction { @ResponseBody public Object factoryListInf(SearchFilter searchFilter) { try { + UserDetails userDetails = (UserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); + SecurityUser securityUser = adminService.getSysUserByUserName(userDetails.getUsername()); + String code = securityUser.getCode(); + if (!securityUser.getRole().equals("ROLE_ADMIN")) { + searchFilter.setFactoryCode(code); + } Pagination page = this.adminService.getFactoryListByPage(searchFilter); return IfishUtil.returnPageData(page, searchFilter.getsEcho()); } catch (Exception e) { @@ -1403,6 +1459,28 @@ public class AdminAction { return null; } + /** + * 电子厂信息列表 + * + * @param iDisplayStart + * @param iDisplayLength + * @param sEcho + * @param sSearch + * @return + */ + @RequestMapping("/factoryListInf1.do") + @ResponseBody + public Object factoryListInf1(SearchFilter searchFilter) { + try { + Pagination page = this.adminService.getHardwareVenderConfig(searchFilter); + return IfishUtil.returnPageData(page, searchFilter.getsEcho()); + } catch (Exception e) { + e.printStackTrace(); + log.error("get factoryListInf information:error message:{}", e.toString()); + } + return null; + } + /** * 是否税收开关 * @@ -1542,6 +1620,20 @@ public class AdminAction { return new ModelAndView("roleAdmin/addFactory", map); } + /** + * 新增电子厂页面 + * + * @return + */ + @RequestMapping("/addFactory1.do") + public ModelAndView addFactory1(ModelMap map) { + List venderList = adminService.getVenderList(); + List hardwareType = adminService.getHardwareTypeList(); + map.put("venderList", venderList); + map.put("hardwareType", hardwareType); + return new ModelAndView("roleAdmin/addFactory1", map); + } + /** * 保存电子厂 * @@ -1573,6 +1665,36 @@ public class AdminAction { return new ModelAndView("roleAdmin/addFactory", map); } + /** + * 保存电子厂 + * + * @param factoryList + * @return + */ + @RequestMapping("/saveFactory1.do") + public ModelAndView saveFactory1(Integer id, String brandCodes, String hardwareTypes, MultipartFile fileUpload) { + Map map = new HashMap<>(); + String status = SysUserEnum.failed101.getKey(); + try { + String newImgName = ""; + if (fileUpload != null) { + newImgName = System.currentTimeMillis() + ".jpg"; + IfishFileUtils.uploadFile(IfishFileDirectory.path_img_goods, newImgName, fileUpload); + } + status = this.adminService.addFactory1(brandCodes, hardwareTypes, newImgName); + map.put("status", status); + if (status.equals(SysUserEnum.success100.getKey())) { + return new ModelAndView("redirect:/page/admin/factoryList1.do"); + } + List list = adminService.getVenderList(); + map.put("list", list); + } catch (Exception e) { + map.put("status", status); + log.error("addFactory:error message:{}", e.toString()); + } + return new ModelAndView("roleAdmin/addFactory1", map); + } + /** * 删除电子厂 * @@ -1587,6 +1709,21 @@ public class AdminAction { } return new ModelAndView("redirect:/page/admin/factoryList.do"); } + /** + * 删除电子厂 + * + * @return + */ + @RequestMapping("/deleteFactory1.do") + public ModelAndView deleteFactory1(Integer id) { + try { + HardwareVender hardwareVender = hardwareVenderDao.get(id); + adminService.deleteHardwareVender(hardwareVender); + } catch (Exception e) { + log.error("deleteFactory:error message:{}", e.toString()); + } + return new ModelAndView("redirect:/page/admin/factoryList1.do"); + } /** * 编辑电子厂页面 @@ -1644,6 +1781,69 @@ public class AdminAction { return new ModelAndView("roleAdmin/editFactory", map); } + /** + * 编辑电子厂页面 + * + * @return + */ + @RequestMapping("/editFactory1.do") + public ModelAndView editFactory1(Integer id) { + Map map = new HashMap<>(); + + UserDetails userDetails = (UserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); + SecurityUser securityUser = adminService.getSysUserByUserName(userDetails.getUsername()); + String code = securityUser.getCode(); + + //电子厂 + FactoryList factoryList = this.adminService.getFactoryByCode(code); + //鱼缸厂 + List list = adminService.getVenderList(); + Map brandCodeMap = new HashMap<>(); + for (VenderList venderList : list) { + CheckNames checkNames = new CheckNames(); + checkNames.setChecked(false); + checkNames.setShowValue(venderList.getBrandCode()); + checkNames.setShowName(venderList.getBrandName()); + brandCodeMap.put(venderList.getBrandCode(), checkNames); + } + //电子厂下选中鱼缸厂 + Iterator venderLists = factoryList.getVenderLists().iterator(); + while (venderLists.hasNext()) { + VenderList venderList = venderLists.next(); + CheckNames checkNames = new CheckNames(); + checkNames.setChecked(true); + checkNames.setShowValue(venderList.getBrandCode()); + checkNames.setShowName(venderList.getBrandName()); + brandCodeMap.put(venderList.getBrandCode(), checkNames); + } + //硬件类型 + List hardwareTypeList = this.adminService.getHardwareTypeList(); + Map hardwareTypeMap = new HashMap<>(); + for (HardwareType hardwareType : hardwareTypeList) { + CheckNames checkNames = new CheckNames(); + checkNames.setChecked(false); + checkNames.setShowValue(hardwareType.getHardwareType()); + checkNames.setShowName(hardwareType.getHardwareName()); + hardwareTypeMap.put(hardwareType.getHardwareType(), checkNames); + } + //鱼缸厂下选中硬件类型 + Iterator hardwareTypes = factoryList.getHardwareTypeSet().iterator(); + while (hardwareTypes.hasNext()) { + HardwareType hardwareType = hardwareTypes.next(); + CheckNames checkNames = new CheckNames(); + checkNames.setChecked(true); + checkNames.setShowValue(hardwareType.getHardwareType()); + checkNames.setShowName(hardwareType.getHardwareName()); + hardwareTypeMap.put(hardwareType.getHardwareType(), checkNames); + } + + map.put("hardwareTypeMap", hardwareTypeMap); + map.put("factoryList", factoryList); + map.put("brandCodeMap", brandCodeMap); + map.put("hardwareVender", adminService.getHardwareVenderConfigById(id)); + return new ModelAndView("roleAdmin/editFactory1", map); + } + /** * 更新电子厂 * @@ -1694,6 +1894,41 @@ public class AdminAction { return new ModelAndView("roleAdmin/editFactory", map); } + @Resource + HardwareVenderDao hardwareVenderDao; + + /** + * 更新电子厂 + * + * @param factoryList + * @return + */ + @RequestMapping("/updateFactory1.do") + public ModelAndView updateFactory1(Integer id, String brandCodes, String hardwareTypes, MultipartFile fileUpload) { + Map map = new HashMap<>(); + String status = SysUserEnum.success100.getKey(); + try { + HardwareVender hardwareVenderConfigById = adminService.getHardwareVenderConfigById(id); + if (!fileUpload.isEmpty()) { + String newImgName = System.currentTimeMillis() + ".jpg"; + IfishFileUtils.uploadFile(IfishFileDirectory.path_img_goods, newImgName, fileUpload); + hardwareVenderConfigById.setBackground(newImgName); + } + hardwareVenderConfigById.setVenderCode(brandCodes); + hardwareVenderConfigById.setHardwareType(hardwareTypes); + hardwareVenderDao.update(hardwareVenderConfigById); + map.put("status", status); + if (status.equals(SysUserEnum.success100.getKey())) { + return new ModelAndView("redirect:/page/admin/factoryList1.do"); + } + } catch (Exception e) { + status = SysUserEnum.failed101.getKey(); + map.put("status", status); + log.error("updateFactory:error message:{}", e.toString()); + } + return new ModelAndView("roleAdmin/editFactory1", map); + } + /** * ****************************************消息推送列表***************************************************** */ diff --git a/src/main/java/com/ifish/dao/FactoryListDao.java b/src/main/java/com/ifish/dao/FactoryListDao.java index 2c09ee1..9037242 100644 --- a/src/main/java/com/ifish/dao/FactoryListDao.java +++ b/src/main/java/com/ifish/dao/FactoryListDao.java @@ -1,7 +1,9 @@ package com.ifish.dao; +import java.util.List; import java.util.Map; +import com.ifish.domain.FactoryVenderData; import com.ifish.entity.FactoryList; /** @@ -14,4 +16,8 @@ public interface FactoryListDao extends BaseDao{ //获取鱼缸厂下所有属电子厂 public Map getFactoryByVenderCode(String venderCode); + + void updateFactoryVenderBackgroud(String brandCode, String factory, String background); + + List getFactoryVenderList(); } diff --git a/src/main/java/com/ifish/dao/HardwareVenderDao.java b/src/main/java/com/ifish/dao/HardwareVenderDao.java new file mode 100644 index 0000000..2d23141 --- /dev/null +++ b/src/main/java/com/ifish/dao/HardwareVenderDao.java @@ -0,0 +1,12 @@ +package com.ifish.dao; + +import com.ifish.entity.HardwareVender; + +/** + * 广告信息 + * @author Administrator + * + */ +public interface HardwareVenderDao extends BaseDao{ + +} diff --git a/src/main/java/com/ifish/daoImpl/FactoryListDaoImpl.java b/src/main/java/com/ifish/daoImpl/FactoryListDaoImpl.java index 823b25a..52da396 100644 --- a/src/main/java/com/ifish/daoImpl/FactoryListDaoImpl.java +++ b/src/main/java/com/ifish/daoImpl/FactoryListDaoImpl.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.ifish.domain.FactoryVenderData; import org.hibernate.transform.Transformers; import org.springframework.stereotype.Repository; @@ -40,6 +41,15 @@ public class FactoryListDaoImpl extends HibernateBaseDao im return returnMap; } + @Override + public void updateFactoryVenderBackgroud(String brandCode, String factory, String background) { + getSession().createSQLQuery("update tbl_factory_vender set background = '" + background + "' where factory_code = '" + factory + "' and brand_code = '" + brandCode + "';").executeUpdate(); + getSession().flush(); + } - + @Override + public List getFactoryVenderList() { + List list = getSession().createSQLQuery("select factory_code,brand_code,background from tbl_factory_vender").setResultTransformer(Transformers.aliasToBean(FactoryVenderData.class)).list(); + return list; + } } diff --git a/src/main/java/com/ifish/daoImpl/HardwareVenderImpl.java b/src/main/java/com/ifish/daoImpl/HardwareVenderImpl.java new file mode 100644 index 0000000..1d44699 --- /dev/null +++ b/src/main/java/com/ifish/daoImpl/HardwareVenderImpl.java @@ -0,0 +1,19 @@ +package com.ifish.daoImpl; + +import com.ifish.dao.HardwareVenderDao; +import com.ifish.entity.HardwareVender; +import com.ifish.hibernate.HibernateBaseDao; +import org.springframework.stereotype.Repository; + +/** + * 广告信息 + */ +@Repository +public class HardwareVenderImpl extends HibernateBaseDao implements HardwareVenderDao { + + @Override + protected Class getEntityClass() { + return HardwareVender.class; + } + +} diff --git a/src/main/java/com/ifish/domain/FactoryVenderData.java b/src/main/java/com/ifish/domain/FactoryVenderData.java new file mode 100644 index 0000000..c3c3f3d --- /dev/null +++ b/src/main/java/com/ifish/domain/FactoryVenderData.java @@ -0,0 +1,38 @@ +package com.ifish.domain; + +/** + * @author: yan.y + * @Description: + * @Date: Created in 13:41 2025/9/18 + * @Modified by: + */ +public class FactoryVenderData { + + private String factory_code; + private String brand_code; + private String background; + + public String getFactory_code() { + return factory_code; + } + + public void setFactory_code(String factory_code) { + this.factory_code = factory_code; + } + + public String getBrand_code() { + return brand_code; + } + + public void setBrand_code(String brand_code) { + this.brand_code = brand_code; + } + + public String getBackground() { + return background; + } + + public void setBackground(String background) { + this.background = background; + } +} diff --git a/src/main/java/com/ifish/entity/FactoryVenderHardwareTypeAttri.java b/src/main/java/com/ifish/entity/FactoryVenderHardwareTypeAttri.java index 5289e39..bdfc2d7 100644 --- a/src/main/java/com/ifish/entity/FactoryVenderHardwareTypeAttri.java +++ b/src/main/java/com/ifish/entity/FactoryVenderHardwareTypeAttri.java @@ -21,6 +21,8 @@ public class FactoryVenderHardwareTypeAttri implements Serializable{ private Integer id; @Column(name="hardware_type") private String hardwareType; + @Column(name="vender_code") + private String venderCode; @Column(name="switch_s1") private String switchS1; @Column(name="switch_s2") @@ -83,6 +85,14 @@ public class FactoryVenderHardwareTypeAttri implements Serializable{ this.id = id; } + public String getVenderCode() { + return venderCode; + } + + public void setVenderCode(String venderCode) { + this.venderCode = venderCode; + } + public String getHardwareType() { return hardwareType; } diff --git a/src/main/java/com/ifish/entity/HardwareVender.java b/src/main/java/com/ifish/entity/HardwareVender.java new file mode 100644 index 0000000..dc65e99 --- /dev/null +++ b/src/main/java/com/ifish/entity/HardwareVender.java @@ -0,0 +1,121 @@ +package com.ifish.entity; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.ifish.handler.CustomDateSerializer; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * 广告位信息 + * @author Administrator + * + */ +@Entity +@Table(name="tbl_hardware_vender_config") +public class HardwareVender implements Serializable{ + + /** + * id + */ + @Id + @Column(name="id") + @GeneratedValue(strategy=GenerationType.AUTO) + private Integer id; + + @Column(name="factory_code") + private String factoryCode; + + @Column(name="hardware_type") + private String hardwareType; + @Transient + private String hardwareName; + @Transient + private String factoryName; + + @Column(name="vender_code") + private String venderCode; + @Transient + private String venderName; + + @Column(name="background") + private String background; + + @JsonSerialize(using=CustomDateSerializer.class) + @Column(name="create_time") + @Temporal(TemporalType.TIMESTAMP) + private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getFactoryCode() { + return factoryCode; + } + + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getVenderCode() { + return venderCode; + } + + public void setVenderCode(String venderCode) { + this.venderCode = venderCode; + } + + public String getBackground() { + return background; + } + + public void setBackground(String background) { + this.background = background; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getFactoryName() { + return factoryName; + } + + public void setFactoryName(String factoryName) { + this.factoryName = factoryName; + } + + public String getVenderName() { + return venderName; + } + + public void setVenderName(String venderName) { + this.venderName = venderName; + } + + public String getHardwareType() { + return hardwareType; + } + + public void setHardwareType(String hardwareType) { + this.hardwareType = hardwareType; + } + + public String getHardwareName() { + return hardwareName; + } + + public void setHardwareName(String hardwareName) { + this.hardwareName = hardwareName; + } +} diff --git a/src/main/java/com/ifish/entity/VenderList.java b/src/main/java/com/ifish/entity/VenderList.java index 37ffe01..2a5407d 100644 --- a/src/main/java/com/ifish/entity/VenderList.java +++ b/src/main/java/com/ifish/entity/VenderList.java @@ -32,7 +32,8 @@ public class VenderList implements Serializable{ private Date updateTime; //创建时间 private Date createTime; - + + private String background; public String getBrandCode() { return brandCode; } @@ -89,5 +90,13 @@ public class VenderList implements Serializable{ public void setLogo(String logo) { this.logo = logo; } + + public String getBackground() { + return background; + } + + public void setBackground(String background) { + this.background = background; + } } diff --git a/src/main/java/com/ifish/search/SearchFilter.java b/src/main/java/com/ifish/search/SearchFilter.java index 525fb0d..16f9691 100644 --- a/src/main/java/com/ifish/search/SearchFilter.java +++ b/src/main/java/com/ifish/search/SearchFilter.java @@ -47,6 +47,8 @@ public class SearchFilter implements Serializable{ private String sSearch; //标识 private String sEcho; + + private String factoryCode; public String getSortField() { return sortField; @@ -168,5 +170,12 @@ public class SearchFilter implements Serializable{ public void setsSearch7(String sSearch7) { this.sSearch7 = sSearch7; } - + + public String getFactoryCode() { + return factoryCode; + } + + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } } diff --git a/src/main/java/com/ifish/service/AdminService.java b/src/main/java/com/ifish/service/AdminService.java index c8c1b4d..0485db4 100644 --- a/src/main/java/com/ifish/service/AdminService.java +++ b/src/main/java/com/ifish/service/AdminService.java @@ -3,6 +3,7 @@ package com.ifish.service; import java.util.List; import java.util.Map; +import com.ifish.domain.FactoryVenderData; import com.ifish.entity.*; import org.springframework.web.multipart.MultipartFile; @@ -167,7 +168,7 @@ public interface AdminService { //更新硬件类型 public HardwareType updateHardwareType(HardwareType hardwareType, String attr1, String attr2, String attr3); public HardwareTypeAttri getHardwareTypeAttri(String hardwareType); - public FactoryVenderHardwareTypeAttri getFactoryVenderHardwareTypeAttri(String hardwareType); + public FactoryVenderHardwareTypeAttri getFactoryVenderHardwareTypeAttri(String hardwareType, String venderCode); //删除硬件类型 public void deleteHardwareType(String hardwareType); @@ -186,13 +187,16 @@ public interface AdminService { //根据编号获取电子厂信息 public FactoryList getFactoryByCode(String code); - + + List getFactoryBrandList(); + //删除电子厂 public void deleteFactory(String code); //新增电子厂信息 public String addFactory(FactoryList factoryList,String brandCodes,String hardwareTypes, String imgName); - + public String addFactory1(String brandCodes,String hardwareTypes, String imgName); + //修改电子厂信息 public String updateFactory(FactoryList factoryList,String brandCodes,String hardwareTypes); @@ -313,4 +317,9 @@ public interface AdminService { boolean billGen(String month); void saveFactoryHardwareTypeAttr(FactoryVenderHardwareTypeAttri factoryVenderHardwareTypeAttri); + + Pagination getHardwareVenderConfig(SearchFilter searchFilter); + HardwareVender getHardwareVenderConfigById(Integer id); + + void deleteHardwareVender(HardwareVender hardwareVender); } diff --git a/src/main/java/com/ifish/serviceImpl/AdminServiceImpl.java b/src/main/java/com/ifish/serviceImpl/AdminServiceImpl.java index 768edbc..1ebf8c5 100644 --- a/src/main/java/com/ifish/serviceImpl/AdminServiceImpl.java +++ b/src/main/java/com/ifish/serviceImpl/AdminServiceImpl.java @@ -7,6 +7,7 @@ import java.text.SimpleDateFormat; import java.util.*; import com.ifish.dao.*; +import com.ifish.domain.*; import com.ifish.entity.*; import com.ifish.entity.event.QueueEventBody; import com.ifish.entity.event.QueueEventEntity; @@ -17,18 +18,14 @@ import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jms.core.JmsTemplate; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.ifish.domain.FactoryData; -import com.ifish.domain.FactoryRecordData; -import com.ifish.domain.HardwareTypeData; -import com.ifish.domain.JsonResult; -import com.ifish.domain.RecordData; -import com.ifish.domain.VenderData; import com.ifish.entity.id.PayBillId; import com.ifish.enums.BooleanEnum; import com.ifish.enums.GwellEnum; @@ -51,6 +48,7 @@ import com.ifish.util.IfishUtil; import com.ifish.util.ResultUtil; import com.ifishNew.mapper.Tbl_Push_List_Mapper; +import javax.annotation.Resource; import javax.jms.Destination; import javax.jms.Session; @@ -230,12 +228,26 @@ public class AdminServiceImpl implements AdminService { @Override public List getVenderList() { - return getVenderListByPage(null).getList(); + UserDetails userDetails = (UserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); + SecurityUser securityUser = getSysUserByUserName(userDetails.getUsername()); + String code = securityUser.getCode(); + SearchFilter searchFilter = new SearchFilter(); + if (!securityUser.getRole().equals("ROLE_ADMIN")) { + searchFilter.setFactoryCode(code); + } + return getVenderListByPage(searchFilter).getList(); } @Override public List getHardwareTypeList() { - return getHardwareTypeByPage(null).getList(); + UserDetails userDetails = (UserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); + SecurityUser securityUser = getSysUserByUserName(userDetails.getUsername()); + String code = securityUser.getCode(); + SearchFilter searchFilter = new SearchFilter(); + if (!securityUser.getRole().equals("ROLE_ADMIN")) { + searchFilter.setFactoryCode(code); + } + return getHardwareTypeByPage(searchFilter).getList(); } /** @@ -873,6 +885,14 @@ public class AdminServiceImpl implements AdminService { if (selectField1 != null && selectField1.length() > 0) { queryList.add(Restrictions.eq("factoryCode", selectField1)); } + if (StringUtils.isNotBlank(searchFilter.getFactoryCode())) { + FactoryList factoryList = this.factoryListDao.get(searchFilter.getFactoryCode()); + List typeList = new ArrayList<>(); + for (VenderList venderList : factoryList.getVenderLists()) { + typeList.add(venderList.getBrandCode()); + } + queryList.add(Restrictions.in("brandCode", typeList.toArray())); + } //排序 List orderList = new ArrayList(); //排序字段 @@ -955,6 +975,14 @@ public class AdminServiceImpl implements AdminService { vender.setLogo(picName + "?timestamp=" + System.currentTimeMillis()); } venderListDao.save(vender); + UserDetails userDetails = (UserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); + SecurityUser securityUser = getSysUserByUserName(userDetails.getUsername()); + if (!securityUser.getRole().equals("ROLE_ADMIN")) { + String code = securityUser.getCode(); + FactoryList factoryList = factoryListDao.get(code); + factoryList.getVenderLists().add(vender); + factoryListDao.save(factoryList); + } return SysUserEnum.success100.getKey(); } } @@ -978,6 +1006,18 @@ public class AdminServiceImpl implements AdminService { } tmpVender.setUpdateTime(new Date()); venderListDao.update(tmpVender); + UserDetails userDetails = (UserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); + SecurityUser securityUser = getSysUserByUserName(userDetails.getUsername()); + String code = securityUser.getCode(); + if (!securityUser.getRole().equals("ROLE_ADMIN")) { + FactoryList factoryList = getFactoryByCode(code); + Set venderLists = factoryList.getVenderLists(); + for (VenderList venderList : venderLists) { + if (venderList.getBrandCode().equals(tmpVender.getBrandCode())) { + factoryListDao.updateFactoryVenderBackgroud(tmpVender.getBrandCode(), code, vender.getBackground()); + } + } + } return SysUserEnum.success100.getKey(); } } @@ -1223,17 +1263,25 @@ public class AdminServiceImpl implements AdminService { @Override public Pagination getHardwareTypeByPage(SearchFilter searchFilter) { if (searchFilter != null) { - List queryList = new ArrayList(); + List queryList = new ArrayList<>(); //排序条件 - List orderList = new ArrayList(); + List orderList = new ArrayList<>(); //分页 Integer iDisplayStart = searchFilter.getiDisplayStart(); Integer iDisplayLength = searchFilter.getiDisplayLength(); //输入框过滤 String sSearch = searchFilter.getsSearch(); - if (sSearch != null && sSearch.length() > 0) { + if (sSearch != null && !sSearch.isEmpty()) { queryList.add(Restrictions.like("hardwareName", "%" + sSearch + "%")); } + if (StringUtils.isNotBlank(searchFilter.getFactoryCode())) { + FactoryList factoryList = this.factoryListDao.get(searchFilter.getFactoryCode()); + List typeList = new ArrayList<>(); + for (HardwareType hardwareType : factoryList.getHardwareTypeSet()) { + typeList.add(hardwareType.getHardwareType()); + } + queryList.add(Restrictions.in("hardwareType", typeList.toArray())); + } orderList.add(Order.asc("hardwareType")); Pagination page = this.hardwareTypeDao.findByCriteria(iDisplayStart, iDisplayLength, orderList, queryList.toArray(new Criterion[queryList.size()])); return page; @@ -1295,13 +1343,15 @@ public class AdminServiceImpl implements AdminService { } String[] attr3List = attr3.split(","); for (String id : attr3List) { + if (id.equals("13")) { + hardwareTypeAttri.setHeatingSet(1); + hardwareTypeAttri.setRefrigerationSet(1); + } if (id.equals("25")) { hardwareTypeAttri.setTemperature1(1); - hardwareTypeAttri.setHeatingSet(1); } if (id.equals("26")) { hardwareTypeAttri.setTemperature2(1); - hardwareTypeAttri.setRefrigerationSet(1); } if (id.equals("27")) { hardwareTypeAttri.setFeedfishSet(1); @@ -1336,8 +1386,8 @@ public class AdminServiceImpl implements AdminService { return hardwareTypeAttriDao.findUniqueByProperty(Restrictions.eq("hardwareType", hardwareType)); } @Override - public FactoryVenderHardwareTypeAttri getFactoryVenderHardwareTypeAttri(String hardwareType) { - return factoryHardwareTypeAttrDao.findUniqueByProperty(Restrictions.eq("hardwareType", hardwareType)); + public FactoryVenderHardwareTypeAttri getFactoryVenderHardwareTypeAttri(String hardwareType, String venderCode) { + return factoryHardwareTypeAttrDao.findUniqueByProperty(Restrictions.eq("hardwareType", hardwareType), Restrictions.eq("venderCode", venderCode)); } @Override @@ -1427,13 +1477,15 @@ public class AdminServiceImpl implements AdminService { } String[] attr3List = attr3.split(","); List attr3Arr = Arrays.asList(attr3List); + if (!attr3Arr.contains("13")) { + hardwareTypeAttri.setHeatingSet(0); + hardwareTypeAttri.setRefrigerationSet(0); + } if (!attr3Arr.contains("25")) { hardwareTypeAttri.setTemperature1(0); - hardwareTypeAttri.setHeatingSet(0); } if (!attr3Arr.contains("26")) { hardwareTypeAttri.setTemperature2(0); - hardwareTypeAttri.setRefrigerationSet(0); } if (!attr3Arr.contains("27")) { hardwareTypeAttri.setFeedfishSet(0); @@ -1463,6 +1515,12 @@ public class AdminServiceImpl implements AdminService { hardwareTypeAttri.setTemperatureShow2(0); } for (String id : attr3List) { + + if (id.equals("13")) { + hardwareTypeAttri.setHeatingSet(1); + hardwareTypeAttri.setRefrigerationSet(1); + } + if (id.equals("25")) { hardwareTypeAttri.setTemperature1(1); hardwareTypeAttri.setHeatingSet(1); @@ -1755,6 +1813,11 @@ public class AdminServiceImpl implements AdminService { return null; } + @Override + public List getFactoryBrandList() { + return factoryListDao.getFactoryVenderList(); + } + @Override public void deleteFactory(String code) { FactoryList factory = getFactoryByCode(code); @@ -1775,7 +1838,7 @@ public class AdminServiceImpl implements AdminService { //新增电子厂 factoryList.setCreateTime(new Date()); //鱼缸厂 - Set venderLists = new HashSet(); + Set venderLists = new HashSet<>(); if (brandCodes != null && brandCodes.length() > 0) { String[] brandCode = brandCodes.split(","); for (int i = 0; i < brandCode.length; i++) { @@ -1802,6 +1865,24 @@ public class AdminServiceImpl implements AdminService { return SysUserEnum.failed101.getKey(); } + @Override + public String addFactory1(String brandCodes, String hardwareTypes, String imgName) { + if (brandCodes != null && hardwareTypes != null) { + HardwareVender hardwareVender = new HardwareVender(); + UserDetails userDetails = (UserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); + SecurityUser securityUser = getSysUserByUserName(userDetails.getUsername()); + String code = securityUser.getCode(); + hardwareVender.setFactoryCode(code); + hardwareVender.setVenderCode(brandCodes); + hardwareVender.setHardwareType(hardwareTypes); + hardwareVender.setBackground(imgName); + hardwareVender.setCreateTime(new Date()); + hardwareVenderDao.save(hardwareVender); + return SysUserEnum.success100.getKey(); + } + return SysUserEnum.failed101.getKey(); + } + @Override public String updateFactory(FactoryList factoryList, String brandCodes, String hardwareTypes) { //鱼缸厂 @@ -1843,6 +1924,9 @@ public class AdminServiceImpl implements AdminService { if (sSearch != null && sSearch.length() > 0) { queryList.add(Restrictions.like("factoryName", "%" + sSearch + "%")); } + if (StringUtils.isNotBlank(searchFilter.getFactoryCode())) { + queryList.add(Restrictions.eq("factoryCode", searchFilter.getFactoryCode())); + } //排序字段 String sortField = searchFilter.getSortField(); if (StringUtils.isNotBlank(sortField)) { @@ -3342,6 +3426,35 @@ public class AdminServiceImpl implements AdminService { this.factoryHardwareTypeAttrDao.save(factoryVenderHardwareTypeAttri); } + @Resource + HardwareVenderDao hardwareVenderDao; + + @Override + public Pagination getHardwareVenderConfig(SearchFilter searchFilter) { + Integer iDisplayStart = searchFilter.getiDisplayStart(); + Integer iDisplayLength = searchFilter.getiDisplayLength(); + List orderList = new ArrayList<>(); + orderList.add(Order.desc("createTime")); + Pagination hardwareVenderPagination = hardwareVenderDao.findByCriteria(iDisplayStart, iDisplayLength, orderList); + List list = hardwareVenderPagination.getList(); + for (HardwareVender hardwareVender : list) { + hardwareVender.setVenderName(venderListDao.get(hardwareVender.getVenderCode()).getBrandName()); + hardwareVender.setFactoryName(factoryListDao.get(hardwareVender.getFactoryCode()).getFactoryName()); + hardwareVender.setHardwareName(hardwareTypeDao.get(hardwareVender.getHardwareType()).getHardwareName()); + } + return hardwareVenderPagination; + } + + @Override + public HardwareVender getHardwareVenderConfigById(Integer id) { + return hardwareVenderDao.get(id); + } + + @Override + public void deleteHardwareVender(HardwareVender hardwareVender) { + hardwareVenderDao.delete(hardwareVender); + } + @Autowired private FactoryService factoryService; diff --git a/src/main/resources/application-security.xml b/src/main/resources/application-security.xml index 5e7a1df..1e4e38c 100644 --- a/src/main/resources/application-security.xml +++ b/src/main/resources/application-security.xml @@ -13,14 +13,8 @@ - + - - - - - - diff --git a/src/main/webapp/WEB-INF/view/roleAdmin/addFactory.jsp b/src/main/webapp/WEB-INF/view/roleAdmin/addFactory.jsp index f387e3a..d3e48c0 100644 --- a/src/main/webapp/WEB-INF/view/roleAdmin/addFactory.jsp +++ b/src/main/webapp/WEB-INF/view/roleAdmin/addFactory.jsp @@ -119,12 +119,12 @@ -
- -
- -
-
+<%--
--%> +<%-- --%> +<%--
--%> +<%-- --%> +<%--
--%> +<%--
--%>
     diff --git a/src/main/webapp/WEB-INF/view/roleAdmin/addFactory1.jsp b/src/main/webapp/WEB-INF/view/roleAdmin/addFactory1.jsp new file mode 100644 index 0000000..eb2a29e --- /dev/null +++ b/src/main/webapp/WEB-INF/view/roleAdmin/addFactory1.jsp @@ -0,0 +1,127 @@ +<%@page import="com.ifish.enums.SysUserEnum"%> +<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> + + + + 新增鱼缸厂配置 + + <%@ include file="../htm/script.jsp" %> + + + + + + + <%@ include file="../htm/header.jsp" %> + +
+
+ + <%@ include file="../htm/sidebar.jsp" %> + +
+ +
+ + + + +
+ <%=SysUserEnum.warn106.getValue()%> +
+ + +
+ <%=SysUserEnum.warn107.getValue()%> +
+ + +
+ 保存<%=SysUserEnum.failed101.getValue()%> +
+ +

+
+
+
+
+
+ +
+ +      + +
+
+
+
+ +
+ +      + +
+
+
+ +
+ +
+
+
+
+      + +
+
+
+
+
+
+
+ + <%@ include file="../htm/setting.jsp" %> +
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/view/roleAdmin/addVender.jsp b/src/main/webapp/WEB-INF/view/roleAdmin/addVender.jsp index eb4ae8d..e16291d 100644 --- a/src/main/webapp/WEB-INF/view/roleAdmin/addVender.jsp +++ b/src/main/webapp/WEB-INF/view/roleAdmin/addVender.jsp @@ -169,6 +169,15 @@
+
+ +
+ + + +
+
+
diff --git a/src/main/webapp/WEB-INF/view/roleAdmin/editFactory.jsp b/src/main/webapp/WEB-INF/view/roleAdmin/editFactory.jsp index 6f40fd0..be6fc39 100644 --- a/src/main/webapp/WEB-INF/view/roleAdmin/editFactory.jsp +++ b/src/main/webapp/WEB-INF/view/roleAdmin/editFactory.jsp @@ -122,14 +122,13 @@
- -
+ <%--
-
+
--%>
     diff --git a/src/main/webapp/WEB-INF/view/roleAdmin/editFactory1.jsp b/src/main/webapp/WEB-INF/view/roleAdmin/editFactory1.jsp new file mode 100644 index 0000000..ac73575 --- /dev/null +++ b/src/main/webapp/WEB-INF/view/roleAdmin/editFactory1.jsp @@ -0,0 +1,135 @@ +<%@page import="com.ifish.enums.SysUserEnum"%> +<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> + + + + 编辑鱼缸厂配置 + + <%@ include file="../htm/script.jsp" %> + + + + + + + <%@ include file="../htm/header.jsp" %> + +
+
+ + <%@ include file="../htm/sidebar.jsp" %> + +
+ +
+ + + + +
+ <%=SysUserEnum.warn106.getValue()%> +
+ + +
+ <%=SysUserEnum.warn107.getValue()%> +
+ + +
+ 保存<%=SysUserEnum.failed101.getValue()%> +
+ +

+
+
+
+ +
+
+ +
+ +      + +
+
+
+
+ +
+ +      + +
+
+ +
+ +
+ + + +
+
+
+
+      + +
+
+
+
+
+
+
+ + <%@ include file="../htm/setting.jsp" %> +
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/view/roleAdmin/editHardwareTypeAttr.jsp b/src/main/webapp/WEB-INF/view/roleAdmin/editHardwareTypeAttr.jsp index 7adb60e..82481f4 100644 --- a/src/main/webapp/WEB-INF/view/roleAdmin/editHardwareTypeAttr.jsp +++ b/src/main/webapp/WEB-INF/view/roleAdmin/editHardwareTypeAttr.jsp @@ -11,7 +11,7 @@ $(function(){ //取消 $("#cancelBtn").click(function(){ - location.href="<%=basePath%>page/admin/hardwareTypeList.do"; + location.href="<%=basePath%>page/admin/factoryList1.do"; }); }); @@ -58,21 +58,31 @@
-
-
-
- +
+
- +
-
-
- -
- + +
+
+ +
+ +
-
+ + +
+
+ +
+ +
+
+ +
@@ -80,6 +90,8 @@
+ +
@@ -87,6 +99,8 @@
+ +
@@ -94,6 +108,8 @@
+ +
@@ -101,6 +117,8 @@
+ +
@@ -108,6 +126,8 @@
+ +
@@ -115,6 +135,8 @@
+ +
@@ -122,6 +144,8 @@
+ +
@@ -129,6 +153,8 @@
+ +
@@ -136,6 +162,8 @@
+ +
@@ -143,94 +171,127 @@
- - + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
- - +
     diff --git a/src/main/webapp/WEB-INF/view/roleAdmin/editVender.jsp b/src/main/webapp/WEB-INF/view/roleAdmin/editVender.jsp index cdc3293..75fd029 100644 --- a/src/main/webapp/WEB-INF/view/roleAdmin/editVender.jsp +++ b/src/main/webapp/WEB-INF/view/roleAdmin/editVender.jsp @@ -159,6 +159,15 @@
+
+ +
+ + + +
+
+
diff --git a/src/main/webapp/WEB-INF/view/roleAdmin/factoryList1.jsp b/src/main/webapp/WEB-INF/view/roleAdmin/factoryList1.jsp new file mode 100644 index 0000000..afe97e1 --- /dev/null +++ b/src/main/webapp/WEB-INF/view/roleAdmin/factoryList1.jsp @@ -0,0 +1,139 @@ +<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> + + + + 鱼缸厂配置 + + <%@ include file="../htm/script.jsp" %> + + + + + + + <%@ include file="../htm/header.jsp" %> + +
+
+ + <%@ include file="../htm/sidebar.jsp" %> + +
+ +
+
+
+
+
+ + + + + + + + + + + + + +
编号鱼缸厂编号鱼缸厂名称硬件类型编号硬件类型名称创建时间设置名称操作
+
+
+
+
+
+ + <%@ include file="../htm/setting.jsp" %> +
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/view/roleAdmin/hardwareTypeList.jsp b/src/main/webapp/WEB-INF/view/roleAdmin/hardwareTypeList.jsp index 70d7604..a85c73d 100644 --- a/src/main/webapp/WEB-INF/view/roleAdmin/hardwareTypeList.jsp +++ b/src/main/webapp/WEB-INF/view/roleAdmin/hardwareTypeList.jsp @@ -71,12 +71,6 @@ "bSortable": false, "sClass":"center" }, - { "mData": function(hardwareType){ - return '' - }, - "bSortable": false, - "sClass":"center" - }, { "mData": function(hardwareType){ return ''; }, @@ -160,7 +154,6 @@ 柜灯 图标 修改 - 设置名称 删除 diff --git a/src/main/webapp/WEB-INF/view/roleAdmin/venderList.jsp b/src/main/webapp/WEB-INF/view/roleAdmin/venderList.jsp index 3aebc57..866891d 100644 --- a/src/main/webapp/WEB-INF/view/roleAdmin/venderList.jsp +++ b/src/main/webapp/WEB-INF/view/roleAdmin/venderList.jsp @@ -5,6 +5,8 @@ 鱼缸厂列表 <%@ include file="../htm/script.jsp" %> + +