From 8471e3fbc0bedebad004a966abab1fb0b2c1aa4b Mon Sep 17 00:00:00 2001 From: wangpeng Date: Tue, 30 Jan 2024 16:50:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E9=9A=90=E6=82=A3=E6=8E=92?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommonController.java} | 14 ++++---- .../CustomController.java} | 26 ++++++++------ .../StandardDictionaryController.java} | 10 +++--- .../CommonMapper.java} | 4 +-- .../CustomItemMapper.java} | 4 +-- .../CustomMapper.java} | 4 +-- .../ListCheckStandardItemMapper.java | 2 +- .../StandardDictionaryMapper.java} | 4 +-- .../CommonService.java} | 4 +-- .../CustomItemService.java} | 4 +-- .../CustomService.java} | 4 +-- .../ListcheckstandarditemService.java | 2 +- .../StandardDictionaryService.java} | 4 +-- .../impl/CommonServiceImpl.java} | 12 +++---- .../impl/CustomItemServiceImpl.java | 34 +++++++++++++++++++ .../impl/CustomServiceImpl.java} | 14 ++++---- .../ListcheckstandarditemServiceImpl.java | 6 ++-- .../impl/StandardDictionaryServiceImpl.java | 34 +++++++++++++++++++ ...gerCheckStandardCustomItemServiceImpl.java | 34 ------------------- ...gerCheckStandardDictionaryServiceImpl.java | 34 ------------------- .../CommonMapper.xml} | 2 +- .../CustomItemMapper.xml} | 2 +- .../CustomMapper.xml} | 2 +- .../ListCheckStandardItemMapper.xml | 2 +- .../StandardDictionaryMapper.xml} | 2 +- 25 files changed, 135 insertions(+), 129 deletions(-) rename src/main/java/com/zcloud/controller/{hiddenDangerCheckStandardCustom/hiddenDangerCheckStandardCommonController.java => hiddenDangerCheckStandard/CommonController.java} (76%) rename src/main/java/com/zcloud/controller/{hiddenDangerCheckStandardCustom/hiddenDangerCheckStandardCustomController.java => hiddenDangerCheckStandard/CustomController.java} (98%) rename src/main/java/com/zcloud/controller/{hiddenDangerCheckStandardCustom/hiddenDangerCheckStandardDictionaryController.java => hiddenDangerCheckStandard/StandardDictionaryController.java} (74%) rename src/main/java/com/zcloud/mapper/datasource/{hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCommonMapper.java => hiddenDangerCheckStandard/CommonMapper.java} (71%) rename src/main/java/com/zcloud/mapper/datasource/{hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCustomItemMapper.java => hiddenDangerCheckStandard/CustomItemMapper.java} (65%) rename src/main/java/com/zcloud/mapper/datasource/{hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCustomMapper.java => hiddenDangerCheckStandard/CustomMapper.java} (96%) rename src/main/java/com/zcloud/mapper/datasource/{hiddenDangerCheckStandardCustom => hiddenDangerCheckStandard}/ListCheckStandardItemMapper.java (95%) rename src/main/java/com/zcloud/mapper/datasource/{hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardDictionaryMapper.java => hiddenDangerCheckStandard/StandardDictionaryMapper.java} (67%) rename src/main/java/com/zcloud/service/{hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCommonService.java => hiddenDangerCheckStandard/CommonService.java} (73%) rename src/main/java/com/zcloud/service/{hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCustomItemService.java => hiddenDangerCheckStandard/CustomItemService.java} (68%) rename src/main/java/com/zcloud/service/{hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCustomService.java => hiddenDangerCheckStandard/CustomService.java} (76%) rename src/main/java/com/zcloud/service/{hiddenDangerCheckStandardCustom => hiddenDangerCheckStandard}/ListcheckstandarditemService.java (88%) rename src/main/java/com/zcloud/service/{hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardDictionaryService.java => hiddenDangerCheckStandard/StandardDictionaryService.java} (71%) rename src/main/java/com/zcloud/service/{hiddenDangerCheckStandardCustom/impl/HiddenDangerCheckStandardCommonServiceImpl.java => hiddenDangerCheckStandard/impl/CommonServiceImpl.java} (52%) create mode 100644 src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomItemServiceImpl.java rename src/main/java/com/zcloud/service/{hiddenDangerCheckStandardCustom/impl/HiddenDangerCheckStandardCustomServiceImpl.java => hiddenDangerCheckStandard/impl/CustomServiceImpl.java} (52%) rename src/main/java/com/zcloud/service/{hiddenDangerCheckStandardCustom => hiddenDangerCheckStandard}/impl/ListcheckstandarditemServiceImpl.java (80%) create mode 100644 src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/StandardDictionaryServiceImpl.java delete mode 100644 src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/impl/HiddenDangerCheckStandardCustomItemServiceImpl.java delete mode 100644 src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/impl/HiddenDangerCheckStandardDictionaryServiceImpl.java rename src/main/resources/mybatis/datasource/{hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCommonMapper.xml => hiddenDangerCheckStandard/CommonMapper.xml} (98%) rename src/main/resources/mybatis/datasource/{hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCustomItemMapper.xml => hiddenDangerCheckStandard/CustomItemMapper.xml} (97%) rename src/main/resources/mybatis/datasource/{hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCustomMapper.xml => hiddenDangerCheckStandard/CustomMapper.xml} (98%) rename src/main/resources/mybatis/datasource/{hiddenDangerCheckStandardCustom => hiddenDangerCheckStandard}/ListCheckStandardItemMapper.xml (98%) rename src/main/resources/mybatis/datasource/{hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardDictionaryMapper.xml => hiddenDangerCheckStandard/StandardDictionaryMapper.xml} (96%) diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandardCustom/hiddenDangerCheckStandardCommonController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CommonController.java similarity index 76% rename from src/main/java/com/zcloud/controller/hiddenDangerCheckStandardCustom/hiddenDangerCheckStandardCommonController.java rename to src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CommonController.java index f126e6c..ae1d755 100644 --- a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandardCustom/hiddenDangerCheckStandardCommonController.java +++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CommonController.java @@ -1,10 +1,10 @@ -package com.zcloud.controller.hiddenDangerCheckStandardCustom; +package com.zcloud.controller.hiddenDangerCheckStandard; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.service.corp.CorpInfoService; -import com.zcloud.service.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardCommonService; +import com.zcloud.service.hiddenDangerCheckStandard.CommonService; import com.zcloud.util.Jurisdiction; import com.zcloud.util.Tools; import org.springframework.beans.factory.annotation.Autowired; @@ -12,7 +12,9 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 说明：清单管理-隐患排查清单 @@ -22,10 +24,10 @@ import java.util.*; */ @Controller @RequestMapping("/hiddenstandardCommon") -public class hiddenDangerCheckStandardCommonController extends BaseController { +public class CommonController extends BaseController { @Autowired - private HiddenDangerCheckStandardCommonService hiddenstandardCommonService; + private CommonService commonService; @Autowired private CorpInfoService corpinfoService; @@ -45,7 +47,7 @@ public class hiddenDangerCheckStandardCommonController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 pd = corpinfoService.findById(pd); //根据ID读取 page.setPd(pd); - List varList = hiddenstandardCommonService.list(page); //列出RiskCheckItem列表 + List varList = commonService.list(page); //列出RiskCheckItem列表 map.put("varList", varList); map.put("page", page); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandardCustom/hiddenDangerCheckStandardCustomController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomController.java similarity index 98% rename from src/main/java/com/zcloud/controller/hiddenDangerCheckStandardCustom/hiddenDangerCheckStandardCustomController.java rename to src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomController.java index 8934bef..f0b94d7 100644 --- a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandardCustom/hiddenDangerCheckStandardCustomController.java +++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomController.java @@ -1,26 +1,30 @@ -package com.zcloud.controller.hiddenDangerCheckStandardCustom; +package com.zcloud.controller.hiddenDangerCheckStandard; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.logs.LogAnno; import com.zcloud.service.check.*; -import com.zcloud.service.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardCustomItemService; -import com.zcloud.service.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardCustomService; +import com.zcloud.service.hiddenDangerCheckStandard.CustomItemService; +import com.zcloud.service.hiddenDangerCheckStandard.CustomService; import com.zcloud.service.offduty.OffDutyService; import com.zcloud.service.risk.IdentificationPartsService; import com.zcloud.service.risk.RiskPointService; import com.zcloud.service.statistics.ListStatisticsService; import com.zcloud.service.system.DepartmentService; import com.zcloud.service.system.UsersService; -import com.zcloud.util.*; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.Tools; +import com.zcloud.util.Warden; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 说明：清单管理-隐患排查清单 @@ -30,12 +34,12 @@ import java.util.*; */ @Controller @RequestMapping("/hiddenstandardCustom") -public class hiddenDangerCheckStandardCustomController extends BaseController { +public class CustomController extends BaseController { @Autowired - private HiddenDangerCheckStandardCustomService hiddenstandardCustomService; + private CustomService customService; @Autowired - private HiddenDangerCheckStandardCustomItemService hiddenstandardCustomItemService; + private CustomItemService customItemService; @Autowired private ListCheckItemService listcheckitemService; @Autowired @@ -73,11 +77,11 @@ public class hiddenDangerCheckStandardCustomController extends BaseController { pd = this.getPageData(); pd.put("CUSTOM_ID", this.get32UUID()); Warden.initDate(pd); - hiddenstandardCustomService.save(pd); + customService.save(pd); PageData itempd = new PageData(); itempd.putAll(pd); itempd.put("CUSTOM_ITEM_ID", this.get32UUID()); - hiddenstandardCustomItemService.save(itempd); + customItemService.save(itempd); map.put("result", errInfo); return map; } @@ -98,7 +102,7 @@ public class hiddenDangerCheckStandardCustomController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 if(Tools.notEmpty(KEYWORDS))npd.put("KEYWORDS", KEYWORDS.trim()); - List varList = hiddenstandardCustomService.listAll(pd); + List varList = customService.listAll(pd); map.put("varList", varList); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandardCustom/hiddenDangerCheckStandardDictionaryController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/StandardDictionaryController.java similarity index 74% rename from src/main/java/com/zcloud/controller/hiddenDangerCheckStandardCustom/hiddenDangerCheckStandardDictionaryController.java rename to src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/StandardDictionaryController.java index 8819ec5..cf8fadb 100644 --- a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandardCustom/hiddenDangerCheckStandardDictionaryController.java +++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/StandardDictionaryController.java @@ -1,8 +1,8 @@ -package com.zcloud.controller.hiddenDangerCheckStandardCustom; +package com.zcloud.controller.hiddenDangerCheckStandard; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.PageData; -import com.zcloud.service.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardDictionaryService; +import com.zcloud.service.hiddenDangerCheckStandard.StandardDictionaryService; import com.zcloud.util.Jurisdiction; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -21,10 +21,10 @@ import java.util.Map; */ @Controller @RequestMapping("/hiddenstandardDictionary") -public class hiddenDangerCheckStandardDictionaryController extends BaseController { +public class StandardDictionaryController extends BaseController { @Autowired - private HiddenDangerCheckStandardDictionaryService hiddenstandardDictionaryService; + private StandardDictionaryService dictionaryService; /** @@ -42,7 +42,7 @@ public class hiddenDangerCheckStandardDictionaryController extends BaseControlle PageData pd = new PageData(); pd = this.getPageData(); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - List varList = hiddenstandardDictionaryService.list(pd); + List varList = dictionaryService.list(pd); map.put("varList", varList); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCommonMapper.java b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CommonMapper.java similarity index 71% rename from src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCommonMapper.java rename to src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CommonMapper.java index 78421d7..4895922 100644 --- a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCommonMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CommonMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.datasource.hiddenDangerCheckStandardCustom; +package com.zcloud.mapper.datasource.hiddenDangerCheckStandard; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -11,7 +11,7 @@ import java.util.List; * 时间：2020-12-30 * 官网：www.zcloudchina.com */ -public interface HiddenDangerCheckStandardCommonMapper { +public interface CommonMapper { /**列表 * @param page diff --git a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCustomItemMapper.java b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomItemMapper.java similarity index 65% rename from src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCustomItemMapper.java rename to src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomItemMapper.java index e90e554..f66cc2b 100644 --- a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCustomItemMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomItemMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.datasource.hiddenDangerCheckStandardCustom; +package com.zcloud.mapper.datasource.hiddenDangerCheckStandard; import com.zcloud.entity.PageData; @@ -8,7 +8,7 @@ import com.zcloud.entity.PageData; * 时间：2020-12-30 * 官网：www.zcloudchina.com */ -public interface HiddenDangerCheckStandardCustomItemMapper { +public interface CustomItemMapper { /**新增 * @param pd diff --git a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCustomMapper.java b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCustomMapper.java rename to src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomMapper.java index d684a0f..64cf8a0 100644 --- a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCustomMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.datasource.hiddenDangerCheckStandardCustom; +package com.zcloud.mapper.datasource.hiddenDangerCheckStandard; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -11,7 +11,7 @@ import java.util.List; * 时间：2020-12-30 * 官网：www.zcloudchina.com */ -public interface HiddenDangerCheckStandardCustomMapper { +public interface CustomMapper { /**新增 * @param pd diff --git a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandardCustom/ListCheckStandardItemMapper.java b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/ListCheckStandardItemMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandardCustom/ListCheckStandardItemMapper.java rename to src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/ListCheckStandardItemMapper.java index c2d597b..5700ed4 100644 --- a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandardCustom/ListCheckStandardItemMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/ListCheckStandardItemMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.datasource.hiddenDangerCheckStandardCustom; +package com.zcloud.mapper.datasource.hiddenDangerCheckStandard; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardDictionaryMapper.java b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/StandardDictionaryMapper.java similarity index 67% rename from src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardDictionaryMapper.java rename to src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/StandardDictionaryMapper.java index f8472aa..7d76b4d 100644 --- a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardDictionaryMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/StandardDictionaryMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.datasource.hiddenDangerCheckStandardCustom; +package com.zcloud.mapper.datasource.hiddenDangerCheckStandard; import com.zcloud.entity.PageData; @@ -10,7 +10,7 @@ import java.util.List; * 时间：2020-12-30 * 官网：www.zcloudchina.com */ -public interface HiddenDangerCheckStandardDictionaryMapper { +public interface StandardDictionaryMapper { /**列表(全部) * @param pd diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCommonService.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CommonService.java similarity index 73% rename from src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCommonService.java rename to src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CommonService.java index 2c4dddf..b303e47 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCommonService.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CommonService.java @@ -1,4 +1,4 @@ -package com.zcloud.service.hiddenDangerCheckStandardCustom; +package com.zcloud.service.hiddenDangerCheckStandard; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -11,7 +11,7 @@ import java.util.List; * 时间：2020-12-30 * 官网：www.zcloudchina.com */ -public interface HiddenDangerCheckStandardCommonService { +public interface CommonService { /**列表 * @param page diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCustomItemService.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomItemService.java similarity index 68% rename from src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCustomItemService.java rename to src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomItemService.java index 44caa34..3b88ce0 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCustomItemService.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomItemService.java @@ -1,4 +1,4 @@ -package com.zcloud.service.hiddenDangerCheckStandardCustom; +package com.zcloud.service.hiddenDangerCheckStandard; import com.zcloud.entity.PageData; @@ -8,7 +8,7 @@ import com.zcloud.entity.PageData; * 时间：2020-12-30 * 官网：www.zcloudchina.com */ -public interface HiddenDangerCheckStandardCustomItemService { +public interface CustomItemService { /**新增 diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCustomService.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomService.java similarity index 76% rename from src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCustomService.java rename to src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomService.java index 5f46b89..9f299fa 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCustomService.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomService.java @@ -1,4 +1,4 @@ -package com.zcloud.service.hiddenDangerCheckStandardCustom; +package com.zcloud.service.hiddenDangerCheckStandard; import com.zcloud.entity.PageData; @@ -10,7 +10,7 @@ import java.util.List; * 时间：2020-12-30 * 官网：www.zcloudchina.com */ -public interface HiddenDangerCheckStandardCustomService { +public interface CustomService { /**新增 * @param pd diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/ListcheckstandarditemService.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/ListcheckstandarditemService.java similarity index 88% rename from src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/ListcheckstandarditemService.java rename to src/main/java/com/zcloud/service/hiddenDangerCheckStandard/ListcheckstandarditemService.java index 259578b..ee502d9 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/ListcheckstandarditemService.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/ListcheckstandarditemService.java @@ -1,4 +1,4 @@ -package com.zcloud.service.hiddenDangerCheckStandardCustom; +package com.zcloud.service.hiddenDangerCheckStandard; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardDictionaryService.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/StandardDictionaryService.java similarity index 71% rename from src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardDictionaryService.java rename to src/main/java/com/zcloud/service/hiddenDangerCheckStandard/StandardDictionaryService.java index 066e509..ba60f7a 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardDictionaryService.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/StandardDictionaryService.java @@ -1,4 +1,4 @@ -package com.zcloud.service.hiddenDangerCheckStandardCustom; +package com.zcloud.service.hiddenDangerCheckStandard; import com.zcloud.entity.PageData; @@ -10,7 +10,7 @@ import java.util.List; * 时间：2020-12-30 * 官网：www.zcloudchina.com */ -public interface HiddenDangerCheckStandardDictionaryService { +public interface StandardDictionaryService { /**列表(全部) * @param pd diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/impl/HiddenDangerCheckStandardCommonServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CommonServiceImpl.java similarity index 52% rename from src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/impl/HiddenDangerCheckStandardCommonServiceImpl.java rename to src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CommonServiceImpl.java index c99d530..6d9a7ee 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/impl/HiddenDangerCheckStandardCommonServiceImpl.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CommonServiceImpl.java @@ -1,9 +1,9 @@ -package com.zcloud.service.hiddenDangerCheckStandardCustom.impl; +package com.zcloud.service.hiddenDangerCheckStandard.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.datasource.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardCommonMapper; -import com.zcloud.service.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardCommonService; +import com.zcloud.mapper.datasource.hiddenDangerCheckStandard.CommonMapper; +import com.zcloud.service.hiddenDangerCheckStandard.CommonService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -18,17 +18,17 @@ import java.util.List; */ @Service @Transactional //开启事物 -public class HiddenDangerCheckStandardCommonServiceImpl implements HiddenDangerCheckStandardCommonService { +public class CommonServiceImpl implements CommonService { @Autowired - private HiddenDangerCheckStandardCommonMapper hiddenstandardCommonMapper; + private CommonMapper commonMapper; /**列表 * @param page * @throws Exception */ public List list(Page page)throws Exception{ - return hiddenstandardCommonMapper.datalistPage(page); + return commonMapper.datalistPage(page); } } diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomItemServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomItemServiceImpl.java new file mode 100644 index 0000000..ce313ad --- /dev/null +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomItemServiceImpl.java @@ -0,0 +1,34 @@ +package com.zcloud.service.hiddenDangerCheckStandard.impl; + +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.hiddenDangerCheckStandard.CustomItemMapper; +import com.zcloud.service.hiddenDangerCheckStandard.CustomItemService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * 说明：清单管理-检查标准项目 + * 作者：luoxiaobao + * 时间：2020-12-30 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class CustomItemServiceImpl implements CustomItemService { + + @Autowired + private CustomItemMapper customItemMapper; + + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + customItemMapper.save(pd); + } + +} + + diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/impl/HiddenDangerCheckStandardCustomServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomServiceImpl.java similarity index 52% rename from src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/impl/HiddenDangerCheckStandardCustomServiceImpl.java rename to src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomServiceImpl.java index 3f62548..6d7c4fe 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/impl/HiddenDangerCheckStandardCustomServiceImpl.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomServiceImpl.java @@ -1,8 +1,8 @@ -package com.zcloud.service.hiddenDangerCheckStandardCustom.impl; +package com.zcloud.service.hiddenDangerCheckStandard.impl; import com.zcloud.entity.PageData; -import com.zcloud.mapper.datasource.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardCustomMapper; -import com.zcloud.service.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardCustomService; +import com.zcloud.mapper.datasource.hiddenDangerCheckStandard.CustomMapper; +import com.zcloud.service.hiddenDangerCheckStandard.CustomService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -17,10 +17,10 @@ import java.util.List; */ @Service @Transactional //开启事物 -public class HiddenDangerCheckStandardCustomServiceImpl implements HiddenDangerCheckStandardCustomService { +public class CustomServiceImpl implements CustomService { @Autowired - private HiddenDangerCheckStandardCustomMapper hiddencheckstandardCustomMapper; + private CustomMapper customMapper; /**新增 @@ -28,7 +28,7 @@ public class HiddenDangerCheckStandardCustomServiceImpl implements HiddenDangerC * @throws Exception */ public void save(PageData pd)throws Exception{ - hiddencheckstandardCustomMapper.save(pd); + customMapper.save(pd); } /**列表 @@ -36,7 +36,7 @@ public class HiddenDangerCheckStandardCustomServiceImpl implements HiddenDangerC * @throws Exception */ public List listAll(PageData pd)throws Exception{ - return hiddencheckstandardCustomMapper.listAll(pd); + return customMapper.listAll(pd); } } diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/impl/ListcheckstandarditemServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/ListcheckstandarditemServiceImpl.java similarity index 80% rename from src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/impl/ListcheckstandarditemServiceImpl.java rename to src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/ListcheckstandarditemServiceImpl.java index 27d9389..57e0e46 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/impl/ListcheckstandarditemServiceImpl.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/ListcheckstandarditemServiceImpl.java @@ -1,8 +1,8 @@ -package com.zcloud.service.hiddenDangerCheckStandardCustom.impl; +package com.zcloud.service.hiddenDangerCheckStandard.impl; import com.zcloud.entity.PageData; -import com.zcloud.mapper.datasource.hiddenDangerCheckStandardCustom.ListCheckStandardItemMapper; -import com.zcloud.service.hiddenDangerCheckStandardCustom.ListcheckstandarditemService; +import com.zcloud.mapper.datasource.hiddenDangerCheckStandard.ListCheckStandardItemMapper; +import com.zcloud.service.hiddenDangerCheckStandard.ListcheckstandarditemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/StandardDictionaryServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/StandardDictionaryServiceImpl.java new file mode 100644 index 0000000..c3f20eb --- /dev/null +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/StandardDictionaryServiceImpl.java @@ -0,0 +1,34 @@ +package com.zcloud.service.hiddenDangerCheckStandard.impl; + +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.hiddenDangerCheckStandard.StandardDictionaryMapper; +import com.zcloud.service.hiddenDangerCheckStandard.StandardDictionaryService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：清单管理 + * 作者：luoxiaobao + * 时间：2020-12-30 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class StandardDictionaryServiceImpl implements StandardDictionaryService { + + @Autowired + private StandardDictionaryMapper dictionaryMapper; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List list(PageData pd)throws Exception{ + return dictionaryMapper.list(pd); + } +} + + diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/impl/HiddenDangerCheckStandardCustomItemServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/impl/HiddenDangerCheckStandardCustomItemServiceImpl.java deleted file mode 100644 index 118db83..0000000 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/impl/HiddenDangerCheckStandardCustomItemServiceImpl.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.zcloud.service.hiddenDangerCheckStandardCustom.impl; - -import com.zcloud.entity.PageData; -import com.zcloud.mapper.datasource.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardCustomItemMapper; -import com.zcloud.service.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardCustomItemService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * 说明：清单管理-检查标准项目 - * 作者：luoxiaobao - * 时间：2020-12-30 - * 官网：www.zcloudchina.com - */ -@Service -@Transactional //开启事物 -public class HiddenDangerCheckStandardCustomItemServiceImpl implements HiddenDangerCheckStandardCustomItemService { - - @Autowired - private HiddenDangerCheckStandardCustomItemMapper hiddenstandardCustomItemMapper; - - - /**新增 - * @param pd - * @throws Exception - */ - public void save(PageData pd)throws Exception{ - hiddenstandardCustomItemMapper.save(pd); - } - -} - - diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/impl/HiddenDangerCheckStandardDictionaryServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/impl/HiddenDangerCheckStandardDictionaryServiceImpl.java deleted file mode 100644 index 6a4e761..0000000 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardCustom/impl/HiddenDangerCheckStandardDictionaryServiceImpl.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.zcloud.service.hiddenDangerCheckStandardCustom.impl; - -import com.zcloud.entity.PageData; -import com.zcloud.mapper.datasource.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardDictionaryMapper; -import com.zcloud.service.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardDictionaryService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - * 说明：清单管理 - * 作者：luoxiaobao - * 时间：2020-12-30 - * 官网：www.zcloudchina.com - */ -@Service -@Transactional //开启事物 -public class HiddenDangerCheckStandardDictionaryServiceImpl implements HiddenDangerCheckStandardDictionaryService { - - @Autowired - private HiddenDangerCheckStandardDictionaryMapper hiddenstandardDictionaryMapper; - - /**列表(全部) - * @param pd - * @throws Exception - */ - public List list(PageData pd)throws Exception{ - return hiddenstandardDictionaryMapper.list(pd); - } -} - - diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCommonMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CommonMapper.xml similarity index 98% rename from src/main/resources/mybatis/datasource/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCommonMapper.xml rename to src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CommonMapper.xml index 0cc819e..f37f9e2 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCommonMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CommonMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCustomItemMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomItemMapper.xml similarity index 97% rename from src/main/resources/mybatis/datasource/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCustomItemMapper.xml rename to src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomItemMapper.xml index 99c1c62..a7e903c 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCustomItemMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomItemMapper.xml @@ -1,7 +1,7 @@ + namespace="com.zcloud.mapper.datasource.hiddenDangerCheckStandard.CustomItemMapper"> diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCustomMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml similarity index 98% rename from src/main/resources/mybatis/datasource/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCustomMapper.xml rename to src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml index 92d175f..acfbc88 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardCustomMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml @@ -1,7 +1,7 @@ + namespace="com.zcloud.mapper.datasource.hiddenDangerCheckStandard.CustomMapper"> diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandardCustom/ListCheckStandardItemMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/ListCheckStandardItemMapper.xml similarity index 98% rename from src/main/resources/mybatis/datasource/hiddenDangerCheckStandardCustom/ListCheckStandardItemMapper.xml rename to src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/ListCheckStandardItemMapper.xml index dc4b744..cbce129 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandardCustom/ListCheckStandardItemMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/ListCheckStandardItemMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardDictionaryMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/StandardDictionaryMapper.xml similarity index 96% rename from src/main/resources/mybatis/datasource/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardDictionaryMapper.xml rename to src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/StandardDictionaryMapper.xml index e2c2a4d..c692f51 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandardCustom/HiddenDangerCheckStandardDictionaryMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/StandardDictionaryMapper.xml @@ -1,6 +1,6 @@ - +