wangpeng
/
integrated_traffic_admin
forked from integrated_whb/integrated_whb_admin
1
0
Fork 0
Code Pull Requests Activity

规范化

pull/1/head
wangpeng 2024-01-30 16:20:18 +08:00
parent 7c856cd8b6
commit b4ee2be627
14 changed files with 27 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/zcloud/controller/hiddenDangerCheckStandardLibrary/CommonController.java → src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CommonController.java
View File

@ -1,17 +1,11 @@
package com.zcloud.controller.hiddenDangerCheckStandardLibrary; package com.zcloud.controller.hiddenDangerCheckStandard;
import com.alibaba.fastjson.JSONArray;
import com.zcloud.controller.base.BaseController; import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
import com.zcloud.service.bus.HiddenCheckService; import com.zcloud.service.hiddenDangerCheckStandard.CommonItemService;
import com.zcloud.service.bus.HiddenSchemeService; import com.zcloud.service.hiddenDangerCheckStandard.CommonService;
import com.zcloud.service.bus.HiddenService;
import com.zcloud.service.bus.ImgFilesService;
import com.zcloud.service.hiddenDangerCheckStandardLibrary.CommonItemService;
import com.zcloud.service.hiddenDangerCheckStandardLibrary.CommonService;
import com.zcloud.util.*; import com.zcloud.util.*;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@ -21,8 +15,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

7
src/main/java/com/zcloud/controller/hiddenDangerCheckStandardLibrary/DictionaryController.java → src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/DictionaryController.java
View File

@ -1,19 +1,16 @@
package com.zcloud.controller.hiddenDangerCheckStandardLibrary; package com.zcloud.controller.hiddenDangerCheckStandard;
import com.zcloud.controller.base.BaseController; import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
import com.zcloud.service.hiddenDangerCheckStandardLibrary.DictionaryService; import com.zcloud.service.hiddenDangerCheckStandard.DictionaryService;
import com.zcloud.util.*; import com.zcloud.util.*;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

2
src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandardLibrary/CommonItemMapper.java → src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandard/CommonItemMapper.java
View File

@ -1,4 +1,4 @@
package com.zcloud.mapper.dsno2.hiddenDangerCheckStandardLibrary; package com.zcloud.mapper.dsno2.hiddenDangerCheckStandard;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;

2
src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandardLibrary/CommonMapper.java → src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandard/CommonMapper.java
View File

@ -1,4 +1,4 @@
package com.zcloud.mapper.dsno2.hiddenDangerCheckStandardLibrary; package com.zcloud.mapper.dsno2.hiddenDangerCheckStandard;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;

2
src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandardLibrary/DictionaryMapper.java → src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandard/DictionaryMapper.java
View File

@ -1,4 +1,4 @@
package com.zcloud.mapper.dsno2.hiddenDangerCheckStandardLibrary; package com.zcloud.mapper.dsno2.hiddenDangerCheckStandard;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;

2
src/main/java/com/zcloud/service/hiddenDangerCheckStandardLibrary/CommonItemService.java → src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CommonItemService.java
View File

@ -1,4 +1,4 @@
package com.zcloud.service.hiddenDangerCheckStandardLibrary; package com.zcloud.service.hiddenDangerCheckStandard;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;

2
src/main/java/com/zcloud/service/hiddenDangerCheckStandardLibrary/CommonService.java → src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CommonService.java
View File

@ -1,4 +1,4 @@
package com.zcloud.service.hiddenDangerCheckStandardLibrary; package com.zcloud.service.hiddenDangerCheckStandard;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;

2
src/main/java/com/zcloud/service/hiddenDangerCheckStandardLibrary/DictionaryService.java → src/main/java/com/zcloud/service/hiddenDangerCheckStandard/DictionaryService.java
View File

@ -1,4 +1,4 @@
package com.zcloud.service.hiddenDangerCheckStandardLibrary; package com.zcloud.service.hiddenDangerCheckStandard;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;

12
src/main/java/com/zcloud/service/hiddenDangerCheckStandardLibrary/impl/CommonItemServiceImpl.java → src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CommonItemServiceImpl.java
View File

@ -1,13 +1,11 @@
package com.zcloud.service.hiddenDangerCheckStandardLibrary.impl; package com.zcloud.service.hiddenDangerCheckStandard.impl;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
import com.zcloud.mapper.dsno2.hiddenDangerCheckStandardLibrary.CommonItemMapper; import com.zcloud.mapper.dsno2.hiddenDangerCheckStandard.CommonItemMapper;
import com.zcloud.mapper.dsno2.hiddenDangerCheckStandardLibrary.CommonMapper; import com.zcloud.service.hiddenDangerCheckStandard.CommonItemService;
import com.zcloud.service.hiddenDangerCheckStandardLibrary.CommonItemService; import com.zcloud.service.hiddenDangerCheckStandard.CommonService;
import com.zcloud.service.hiddenDangerCheckStandardLibrary.CommonService; import com.zcloud.service.hiddenDangerCheckStandard.DictionaryService;
import com.zcloud.service.hiddenDangerCheckStandardLibrary.DictionaryService;
import com.zcloud.util.Tools;
import com.zcloud.util.UuidUtil; import com.zcloud.util.UuidUtil;
import com.zcloud.util.Warden; import com.zcloud.util.Warden;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

15
src/main/java/com/zcloud/service/hiddenDangerCheckStandardLibrary/impl/CommonServiceImpl.java → src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CommonServiceImpl.java
View File

@ -1,19 +1,15 @@
package com.zcloud.service.hiddenDangerCheckStandardLibrary.impl; package com.zcloud.service.hiddenDangerCheckStandard.impl;
import com.alibaba.excel.EasyExcel; import com.alibaba.excel.EasyExcel;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
import com.zcloud.mapper.dsno2.hiddenDangerCheckStandardLibrary.CommonMapper; import com.zcloud.mapper.dsno2.hiddenDangerCheckStandard.CommonMapper;
import com.zcloud.service.depository.impl.HiddenLibraryWarden; import com.zcloud.service.hiddenDangerCheckStandard.CommonItemService;
import com.zcloud.service.hiddenDangerCheckStandardLibrary.CommonItemService; import com.zcloud.service.hiddenDangerCheckStandard.CommonService;
import com.zcloud.service.hiddenDangerCheckStandardLibrary.CommonService; import com.zcloud.service.hiddenDangerCheckStandard.DictionaryService;
import com.zcloud.service.hiddenDangerCheckStandardLibrary.DictionaryService;
import com.zcloud.service.system.DictionariesService;
import com.zcloud.util.ObjectExcelRead;
import com.zcloud.util.Tools; import com.zcloud.util.Tools;
import com.zcloud.util.UuidUtil; import com.zcloud.util.UuidUtil;
import com.zcloud.util.Warden; import com.zcloud.util.Warden;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -21,7 +17,6 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
/** /**
* 说明：隐患排查标准表（通用） * 说明：隐患排查标准表（通用）

9
src/main/java/com/zcloud/service/hiddenDangerCheckStandardLibrary/impl/DictionaryServiceImpl.java → src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/DictionaryServiceImpl.java
View File

@ -1,12 +1,9 @@
package com.zcloud.service.hiddenDangerCheckStandardLibrary.impl; package com.zcloud.service.hiddenDangerCheckStandard.impl;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
import com.zcloud.mapper.dsno2.hiddenDangerCheckStandardLibrary.DictionaryMapper; import com.zcloud.mapper.dsno2.hiddenDangerCheckStandard.DictionaryMapper;
import com.zcloud.service.hiddenDangerCheckStandardLibrary.DictionaryService; import com.zcloud.service.hiddenDangerCheckStandard.DictionaryService;
import com.zcloud.util.Tools;
import com.zcloud.util.Warden;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;

2
src/main/resources/mybatis/dsno2/hiddenDangerCheckStandardLibrary/CommonItemMapper.xml → src/main/resources/mybatis/dsno2/hiddenDangerCheckStandard/CommonItemMapper.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zcloud.mapper.dsno2.hiddenDangerCheckStandardLibrary.CommonItemMapper"> <mapper namespace="com.zcloud.mapper.dsno2.hiddenDangerCheckStandard.CommonItemMapper">
<!--表名 --> <!--表名 -->
<sql id="tableName"> <sql id="tableName">

2
src/main/resources/mybatis/dsno2/hiddenDangerCheckStandardLibrary/CommonMapper.xml → src/main/resources/mybatis/dsno2/hiddenDangerCheckStandard/CommonMapper.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zcloud.mapper.dsno2.hiddenDangerCheckStandardLibrary.CommonMapper"> <mapper namespace="com.zcloud.mapper.dsno2.hiddenDangerCheckStandard.CommonMapper">
<!--表名 --> <!--表名 -->
<sql id="tableName"> <sql id="tableName">

2
src/main/resources/mybatis/dsno2/hiddenDangerCheckStandardLibrary/DictionaryMapper.xml → src/main/resources/mybatis/dsno2/hiddenDangerCheckStandard/DictionaryMapper.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zcloud.mapper.dsno2.hiddenDangerCheckStandardLibrary.DictionaryMapper"> <mapper namespace="com.zcloud.mapper.dsno2.hiddenDangerCheckStandard.DictionaryMapper">
<!--表名 --> <!--表名 -->
<sql id="tableName"> <sql id="tableName">