从福建版本移植

pom.xml

@@ -141,47 +141,11 @@
             <groupId>net.sf.ehcache</groupId>
             <artifactId>ehcache</artifactId>
         </dependency>
-        <!--<dependency>-->
-        <!--<groupId>org.springframework.boot</groupId>-->
-        <!--<artifactId>spring-boot-starter-data-redis</artifactId>-->
-        <!--</dependency>-->
-        <!-- quartz -->
-        <!--<dependency>-->
-        <!--<groupId>org.springframework.boot</groupId>-->
-        <!--<artifactId>spring-boot-starter-cache</artifactId>-->
-        <!--</dependency>-->
 
-        <!--<dependency>-->
-        <!--<groupId>net.sf.ehcache</groupId>-->
-        <!--<artifactId>ehcache</artifactId>-->
-        <!--</dependency>-->
-
-
-        <dependency>
-            <groupId>org.quartz-scheduler</groupId>
-            <artifactId>quartz</artifactId>
-            <version>2.2.1</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>slf4j-api</artifactId>
-                    <groupId>org.slf4j</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- SpringWebSocket依赖 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-devtools</artifactId>-->
-<!--            <optional>true</optional>-->
-<!--        </dependency>-->
 
         <!--swagger2-->
         <dependency>
@@ -214,25 +178,6 @@
             <artifactId>jsoup</artifactId>
             <version>1.9.2</version>
         </dependency>
-
-        <!--war包部署需要-->
-        <!--<dependency>-->
-        <!--<groupId>org.springframework.boot</groupId>-->
-        <!--<artifactId>spring-boot-starter-web</artifactId>-->
-        <!--&lt;!&ndash; 移除嵌入式tomcat插件 &ndash;&gt;-->
-        <!--<exclusions>-->
-        <!--<exclusion>-->
-        <!--<groupId>org.springframework.boot</groupId>-->
-        <!--<artifactId>spring-boot-starter-tomcat</artifactId>-->
-        <!--</exclusion>-->
-        <!--</exclusions>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-        <!--<groupId>javax.servlet</groupId>-->
-        <!--<artifactId>javax.servlet-api</artifactId>-->
-        <!--<version>3.1.0</version>-->
-        <!--<scope>provided</scope>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>com.netflix.feign</groupId>
             <artifactId>feign-core</artifactId>
@@ -244,29 +189,6 @@
             <version>8.18.0</version>
         </dependency>
 
-        <!--        <dependency>-->
-        <!--            <groupId>org.springframework.cloud</groupId>-->
-        <!--            <artifactId>spring-cloud-starter-openfeign</artifactId>-->
-        <!--            <version>2.1.2.RELEASE</version>-->
-        <!--        </dependency>-->
-
-        <!--        <dependency>-->
-        <!--            <groupId>org.apache.poi</groupId>-->
-        <!--            <artifactId>poi</artifactId>-->
-        <!--            <version>4.0.1</version>-->
-        <!--        </dependency>-->
-        <!--        <dependency>-->
-        <!--            <groupId>org.apache.poi</groupId>-->
-        <!--            <artifactId>poi-ooxml</artifactId>-->
-        <!--            <version>4.0.1</version>-->
-        <!--        </dependency>-->
-
-        <!-- easyexcel相关依赖 -->
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba</groupId>-->
-<!--            <artifactId>easyexcel</artifactId>-->
-<!--            <version>1.1.2-beta5</version>-->
-<!--        </dependency>-->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
@@ -361,27 +283,4 @@
             </plugin>
         </plugins>
     </build>
-    <!--<repositories>-->
-    <!--<repository>-->
-    <!--<id>public</id>-->
-    <!--<name>aliyun nexus</name>-->
-    <!--<url>http://maven.aliyun.com/nexus/content/groups/public/</url>-->
-    <!--<releases>-->
-    <!--<enabled>true</enabled>-->
-    <!--</releases>-->
-    <!--</repository>-->
-    <!--</repositories>-->
-    <!--<pluginRepositories>-->
-    <!--<pluginRepository>-->
-    <!--<id>public</id>-->
-    <!--<name>aliyun nexus</name>-->
-    <!--<url>http://maven.aliyun.com/nexus/content/groups/public/</url>-->
-    <!--<releases>-->
-    <!--<enabled>true</enabled>-->
-    <!--</releases>-->
-    <!--<snapshots>-->
-    <!--<enabled>false</enabled>-->
-    <!--</snapshots>-->
-    <!--</pluginRepository>-->
-    <!--</pluginRepositories>-->
 </project>

src/main/java/com/bootdo/blog/controller/BlogController.java

@@ -1,59 +0,0 @@
-package com.bootdo.blog.controller;
-
-import com.bootdo.blog.domain.ContentDO;
-import com.bootdo.blog.service.ContentService;
-import com.bootdo.common.utils.DateUtils;
-import com.bootdo.common.utils.PageUtils;
-import com.bootdo.common.utils.Query;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author bootdo 1992lcg@163.com
- */
-@RequestMapping("/blog")
-@Controller
-public class BlogController {
-	@Autowired
-    private ContentService bContentService;
-
-	@GetMapping()
-	String blog() {
-		return "blog/index/main";
-	}
-
-	@ResponseBody
-	@GetMapping("/open/list")
-	public PageUtils opentList(@RequestParam Map<String, Object> params) {
-		Query query = new Query(params);
-		List<ContentDO> bContentList = bContentService.list(query);
-		int total = bContentService.count(query);
-		PageUtils pageUtils = new PageUtils(bContentList, total);
-		return pageUtils;
-	}
-
-	@GetMapping("/open/post/{cid}")
-	String post(@PathVariable("cid") Long cid, Model model) {
-		ContentDO bContentDO = bContentService.get(cid);
-		model.addAttribute("bContent", bContentDO);
-		model.addAttribute("gtmModified", DateUtils.format(bContentDO.getGtmModified()));
-		return "blog/index/post";
-	}
-	@GetMapping("/open/page/{categories}")
-	String about(@PathVariable("categories") String categories, Model model) {
-		Map<String, Object> map = new HashMap<>(16);
-		map.put("categories", categories);
-		ContentDO bContentDO =null;
-		if(bContentService.list(map).size()>0){
-			 bContentDO = bContentService.list(map).get(0);
-		}
-		model.addAttribute("bContent", bContentDO);
-		return "blog/index/post";
-	}
-}

src/main/java/com/bootdo/blog/controller/ContentController.java

@@ -1,165 +0,0 @@
-package com.bootdo.blog.controller;
-
-import com.bootdo.blog.domain.ContentDO;
-import com.bootdo.blog.service.ContentService;
-import com.bootdo.common.annotation.Log;
-import com.bootdo.common.config.Constant;
-import com.bootdo.common.controller.BaseController;
-import com.bootdo.common.utils.PageUtils;
-import com.bootdo.common.utils.Query;
-import com.bootdo.common.utils.R;
-import org.apache.shiro.authz.annotation.Logical;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 文章内容
- * 
- * @author chglee
- * @email 1992lcg@163.com
- * @date 2017-09-09 10:03:34
- */
-@Controller
-@RequestMapping("/blog/bContent")
-public class ContentController extends BaseController {
-	@Autowired
-	ContentService bContentService;
-
-	@Log("访问门户信息")
-	@GetMapping()
-	@RequiresPermissions("blog:bContent:bContent")
-	String bContent() {
-		return "blog/bContent/bContent";
-	}
-
-	@Log("访问门户轮播信息")
-	@GetMapping("/carousel")
-	@RequiresPermissions("blog:bContent:carousel")
-	String bContent2() {
-		return "blog/bContent2/bContent";
-	}
-
-	@ResponseBody
-	@GetMapping("/list")
-	@RequiresPermissions(value = {"blog:bContent:bContent", "blog:bContent:carousel"}, logical = Logical.OR)
-	public PageUtils list(@RequestParam Map<String, Object> params) {
-		Query query = new Query(params);
-		List<ContentDO> bContentList = bContentService.list(query);
-		int total = bContentService.count(query);
-		PageUtils pageUtils = new PageUtils(bContentList, total);
-		return pageUtils;
-	}
-
-	@GetMapping("/add")
-	@RequiresPermissions("blog:bContent:add")
-	String add() {
-		return "blog/bContent/add";
-	}
-
-	@GetMapping("/carousel/add")
-	@RequiresPermissions("blog:carousel:add")
-	String add2() {
-		return "blog/bContent2/add";
-	}
-
-	@GetMapping("/edit/{cid}")
-	@RequiresPermissions("blog:bContent:edit")
-	String edit(@PathVariable("cid") Long cid, Model model) {
-		ContentDO bContentDO = bContentService.get(cid);
-		model.addAttribute("bContent", bContentDO);
-		return "blog/bContent/edit";
-	}
-
-	@GetMapping("/carousel/edit/{cid}")
-	@RequiresPermissions("blog:carousel:edit")
-	String edit2(@PathVariable("cid") Long cid, Model model) {
-		ContentDO bContentDO = bContentService.get(cid);
-		model.addAttribute("bContent", bContentDO);
-		return "blog/bContent2/edit";
-	}
-
-	/**
-	 * 保存
-	 */
-	@ResponseBody
-	@RequiresPermissions(value = {"blog:bContent:add", "blog:carousel:add"}, logical = Logical.OR)
-	@PostMapping("/save")
-	public R save(ContentDO bContent) {
-		if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
-			return R.error(1, "演示系统不允许修改,完整体验请部署程序");
-		}
-		if (bContent.getAllowComment() == null) {
-			bContent.setAllowComment(0);
-		}
-		if (bContent.getAllowFeed() == null) {
-			bContent.setAllowFeed(0);
-		}
-		if(null==bContent.getType()) {
-			bContent.setType("article");
-		}
-		bContent.setGtmCreate(new Date());
-		bContent.setGtmModified(new Date());
-		int count;
-		if (bContent.getCid() == null || "".equals(bContent.getCid())) {
-			count = bContentService.save(bContent);
-		} else {
-			count = bContentService.update(bContent);
-		}
-		if (count > 0) {
-			return R.ok().put("cid", bContent.getCid());
-		}
-		return R.error();
-	}
-
-	/**
-	 * 修改
-	 */
-	@RequiresPermissions(value = {"blog:bContent:edit", "blog:carousel:edit"}, logical = Logical.OR)
-	@ResponseBody
-	@RequestMapping("/update")
-	public R update( ContentDO bContent) {
-		if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
-			return R.error(1, "演示系统不允许修改,完整体验请部署程序");
-		}
-		bContent.setGtmCreate(new Date());
-		bContentService.update(bContent);
-		return R.ok();
-	}
-
-	/**
-	 * 删除
-	 */
-	@RequiresPermissions(value = {"blog:bContent:remove", "blog:carousel:remove"}, logical = Logical.OR)
-	@PostMapping("/remove")
-	@ResponseBody
-	public R remove(Long id) {
-		if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
-			return R.error(1, "演示系统不允许修改,完整体验请部署程序");
-		}
-		if (bContentService.remove(id) > 0) {
-			return R.ok();
-		}
-		return R.error();
-	}
-
-	/**
-	 * 删除
-	 */
-	@RequiresPermissions(value = {"blog:bContent:batchRemove", "blog:carousel:batchRemove"}, logical = Logical.OR)
-	@PostMapping("/batchRemove")
-	@ResponseBody
-	public R remove(@RequestParam("ids[]") Long[] cids) {
-		if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
-			return R.error(1, "演示系统不允许修改,完整体验请部署程序");
-		}
-		bContentService.batchRemove(cids);
-		return R.ok();
-	}
-}

src/main/java/com/bootdo/blog/dao/ContentDao.java

@@ -1,81 +0,0 @@
-package com.bootdo.blog.dao;
-
-import com.bootdo.blog.domain.ContentDO;
-
-import java.util.List;
-import java.util.Map;
-
-import com.bootdo.portal.vo.IndexCarouselVO;
-import com.bootdo.portal.vo.NameAndCountVO;
-import com.bootdo.portal.vo.PoliciesAndRegulationsVO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * 文章内容
- * @author chglee
- * @email 1992lcg@163.com
- * @date 2017-10-03 16:17:48
- */
-@Mapper
-public interface ContentDao {
-
-	ContentDO get(Long cid);
-	
-	List<ContentDO> list(Map<String,Object> map);
-
-    int count(Map<String, Object> map);
-
-    int save(ContentDO content);
-
-    int update(ContentDO content);
-
-    int remove(Long cid);
-
-    int batchRemove(Long[] cids);
-
-    /**
-     * 获取首页轮播图列表
-     *
-     * @return
-     */
-    List<IndexCarouselVO> getCarousel();
-
-    /**
-     * 根据位置获取文章数据列表
-     *
-     * @param position
-     * @return
-     */
-    List<IndexCarouselVO> getArticleByTags(@Param("position") Integer position);
-
-    /**
-     * 获取 上报数据最多的企业前四
-     *
-     * @return
-     */
-    List<NameAndCountVO> getPopularEnterprise();
-
-    /**
-     * 热门行业统计
-     *
-     * @return
-     */
-    List<NameAndCountVO> getPopularIndustry();
-
-    /**
-     * 门户获取政策法规列表
-     *
-     * @param parameter
-     * @return
-     */
-    List<PoliciesAndRegulationsVO> portalPoliciesRegulations(Map<String, Object> parameter);
-
-    /**
-     * 门户获取政策法规总数量
-     *
-     * @param parameter
-     * @return
-     */
-    Long portalPoliciesRegulationsCount(Map<String, Object> parameter);
-}

src/main/java/com/bootdo/blog/domain/ContentDO.java

@@ -1,295 +0,0 @@
-package com.bootdo.blog.domain;
-
-import java.io.Serializable;
-import java.util.Date;
-
-
-
-/**
- * 文章内容
- * 
- * @author chglee
- * @email 1992lcg@163.com
- * @date 2017-09-22 13:16:10
- */
-public class ContentDO implements Serializable {
-	private static final long serialVersionUID = 1L;
-	
-	//
-	private Long cid;
-	//标题
-	private String title;
-	//
-	private String slug;
-	//创建人id
-	private Long created;
-	//最近修改人id
-	private Long modified;
-	//内容
-	private String content;
-	//类型
-	private String type;
-	//标签
-	private String tags;
-	//分类
-	private String categories;
-	//
-	private Integer hits;
-	//评论数量
-	private Integer commentsNum;
-	//开启评论
-	private Integer allowComment;
-	//允许ping
-	private Integer allowPing;
-	//允许反馈
-	private Integer allowFeed;
-	//状态
-	private Integer status;
-	//作者
-	private String author;
-	//创建时间
-	private Date gtmCreate;
-	//修改时间
-	private Date gtmModified;
-
-	/**
-	 * 设置：
-	 */
-	public void setCid(Long cid) {
-		this.cid = cid;
-	}
-	/**
-	 * 获取：
-	 */
-	public Long getCid() {
-		return cid;
-	}
-	/**
-	 * 设置：标题
-	 */
-	public void setTitle(String title) {
-		this.title = title;
-	}
-	/**
-	 * 获取：标题
-	 */
-	public String getTitle() {
-		return title;
-	}
-	/**
-	 * 设置：
-	 */
-	public void setSlug(String slug) {
-		this.slug = slug;
-	}
-	/**
-	 * 获取：
-	 */
-	public String getSlug() {
-		return slug;
-	}
-	/**
-	 * 设置：创建人id
-	 */
-	public void setCreated(Long created) {
-		this.created = created;
-	}
-	/**
-	 * 获取：创建人id
-	 */
-	public Long getCreated() {
-		return created;
-	}
-	/**
-	 * 设置：最近修改人id
-	 */
-	public void setModified(Long modified) {
-		this.modified = modified;
-	}
-	/**
-	 * 获取：最近修改人id
-	 */
-	public Long getModified() {
-		return modified;
-	}
-	/**
-	 * 设置：内容
-	 */
-	public void setContent(String content) {
-		this.content = content;
-	}
-	/**
-	 * 获取：内容
-	 */
-	public String getContent() {
-		return content;
-	}
-	/**
-	 * 设置：类型
-	 */
-	public void setType(String type) {
-		this.type = type;
-	}
-	/**
-	 * 获取：类型
-	 */
-	public String getType() {
-		return type;
-	}
-	/**
-	 * 设置：标签
-	 */
-	public void setTags(String tags) {
-		this.tags = tags;
-	}
-	/**
-	 * 获取：标签
-	 */
-	public String getTags() {
-		return tags;
-	}
-	/**
-	 * 设置：分类
-	 */
-	public void setCategories(String categories) {
-		this.categories = categories;
-	}
-	/**
-	 * 获取：分类
-	 */
-	public String getCategories() {
-		return categories;
-	}
-	/**
-	 * 设置：
-	 */
-	public void setHits(Integer hits) {
-		this.hits = hits;
-	}
-	/**
-	 * 获取：
-	 */
-	public Integer getHits() {
-		return hits;
-	}
-	/**
-	 * 设置：评论数量
-	 */
-	public void setCommentsNum(Integer commentsNum) {
-		this.commentsNum = commentsNum;
-	}
-	/**
-	 * 获取：评论数量
-	 */
-	public Integer getCommentsNum() {
-		return commentsNum;
-	}
-	/**
-	 * 设置：开启评论
-	 */
-	public void setAllowComment(Integer allowComment) {
-		this.allowComment = allowComment;
-	}
-	/**
-	 * 获取：开启评论
-	 */
-	public Integer getAllowComment() {
-		return allowComment;
-	}
-	/**
-	 * 设置：允许ping
-	 */
-	public void setAllowPing(Integer allowPing) {
-		this.allowPing = allowPing;
-	}
-	/**
-	 * 获取：允许ping
-	 */
-	public Integer getAllowPing() {
-		return allowPing;
-	}
-	/**
-	 * 设置：允许反馈
-	 */
-	public void setAllowFeed(Integer allowFeed) {
-		this.allowFeed = allowFeed;
-	}
-	/**
-	 * 获取：允许反馈
-	 */
-	public Integer getAllowFeed() {
-		return allowFeed;
-	}
-	/**
-	 * 设置：状态
-	 */
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-	/**
-	 * 获取：状态
-	 */
-	public Integer getStatus() {
-		return status;
-	}
-	/**
-	 * 设置：作者
-	 */
-	public void setAuthor(String author) {
-		this.author = author;
-	}
-	/**
-	 * 获取：作者
-	 */
-	public String getAuthor() {
-		return author;
-	}
-	/**
-	 * 设置：创建时间
-	 */
-	public void setGtmCreate(Date gtmCreate) {
-		this.gtmCreate = gtmCreate;
-	}
-	/**
-	 * 获取：创建时间
-	 */
-	public Date getGtmCreate() {
-		return gtmCreate;
-	}
-	/**
-	 * 设置：修改时间
-	 */
-	public void setGtmModified(Date gtmModified) {
-		this.gtmModified = gtmModified;
-	}
-	/**
-	 * 获取：修改时间
-	 */
-	public Date getGtmModified() {
-		return gtmModified;
-	}
-
-	@Override
-	public String toString() {
-		return "ContentDO{" +
-				"cid=" + cid +
-				", title='" + title + '\'' +
-				", slug='" + slug + '\'' +
-				", created=" + created +
-				", modified=" + modified +
-				", content='" + content + '\'' +
-				", type='" + type + '\'' +
-				", tags='" + tags + '\'' +
-				", categories='" + categories + '\'' +
-				", hits=" + hits +
-				", commentsNum=" + commentsNum +
-				", allowComment=" + allowComment +
-				", allowPing=" + allowPing +
-				", allowFeed=" + allowFeed +
-				", status=" + status +
-				", author='" + author + '\'' +
-				", gtmCreate=" + gtmCreate +
-				", gtmModified=" + gtmModified +
-				'}';
-	}
-}

src/main/java/com/bootdo/blog/service/ContentService.java

@@ -1,79 +0,0 @@
-package com.bootdo.blog.service;
-
-import com.bootdo.blog.domain.ContentDO;
-import com.bootdo.portal.vo.IndexCarouselVO;
-import com.bootdo.portal.vo.NameAndCountVO;
-import com.bootdo.portal.vo.PoliciesAndRegulationsVO;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 文章内容
- * 
- * @author chglee
- * @email 1992lcg@163.com
- * @date 2017-09-09 10:03:34
- */
-public interface ContentService {
-	
-	ContentDO get(Long cid);
-	
-	List<ContentDO> list(Map<String, Object> map);
-
-    int count(Map<String, Object> map);
-
-    int save(ContentDO bContent);
-
-    int update(ContentDO bContent);
-
-    int remove(Long cid);
-
-    int batchRemove(Long[] cids);
-
-    /**
-     * 获取首页轮播数据
-     *
-     * @return
-     */
-    List<IndexCarouselVO> getCarousel();
-
-    /**
-     * 根据位置获取文章数据列表
-     *
-     * @param position
-     * @return
-     */
-    List<IndexCarouselVO> getArticleByTags(Integer position);
-
-    /**
-     * 获取 上报数据最多的企业前四
-     *
-     * @return
-     */
-    List<NameAndCountVO> getPopularEnterprise();
-
-
-    /**
-     * 统计热门行业数据列表
-     *
-     * @return
-     */
-    List<NameAndCountVO> getPopularIndustry();
-
-    /**
-     * 门户获取政策法规列表
-     *
-     * @param parameter
-     * @return
-     */
-    List<PoliciesAndRegulationsVO> portalPoliciesRegulations(Map<String, Object> parameter);
-
-    /**
-     * 门户获取政策法规总数量
-     *
-     * @param parameter
-     * @return
-     */
-    Long portalPoliciesRegulationsCount(Map<String, Object> parameter);
-}

src/main/java/com/bootdo/blog/service/impl/ContentServiceImpl.java

@@ -1,89 +0,0 @@
-package com.bootdo.blog.service.impl;
-
-import com.bootdo.portal.vo.IndexCarouselVO;
-import com.bootdo.portal.vo.NameAndCountVO;
-import com.bootdo.portal.vo.PoliciesAndRegulationsVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-import com.bootdo.blog.dao.ContentDao;
-import com.bootdo.blog.domain.ContentDO;
-import com.bootdo.blog.service.ContentService;
-
-
-
-@Service
-public class ContentServiceImpl implements ContentService {
-	@Autowired
-	private ContentDao bContentMapper;
-	
-	@Override
-	public ContentDO get(Long cid){
-		return bContentMapper.get(cid);
-	}
-	
-	@Override
-	public List<ContentDO> list(Map<String, Object> map){
-		return bContentMapper.list(map);
-	}
-	
-	@Override
-	public int count(Map<String, Object> map){
-		return bContentMapper.count(map);
-	}
-	
-	@Override
-	public int save(ContentDO bContent){
-		return bContentMapper.save(bContent);
-	}
-	
-	@Override
-	public int update(ContentDO bContent){
-		return bContentMapper.update(bContent);
-	}
-
-    @Override
-    public int remove(Long cid) {
-        return bContentMapper.remove(cid);
-    }
-
-    @Override
-    public int batchRemove(Long[] cids) {
-        return bContentMapper.batchRemove(cids);
-    }
-
-    @Override
-    public List<IndexCarouselVO> getCarousel() {
-
-        return bContentMapper.getCarousel();
-    }
-
-    @Override
-    public List<IndexCarouselVO> getArticleByTags(Integer position) {
-        return bContentMapper.getArticleByTags(position);
-    }
-
-    @Override
-    public List<NameAndCountVO> getPopularEnterprise() {
-        return bContentMapper.getPopularEnterprise();
-    }
-
-    @Override
-    public List<NameAndCountVO> getPopularIndustry() {
-        return bContentMapper.getPopularIndustry();
-    }
-
-    @Override
-    public List<PoliciesAndRegulationsVO> portalPoliciesRegulations(Map<String, Object> parameter) {
-        return bContentMapper.portalPoliciesRegulations(parameter);
-    }
-
-    @Override
-    public Long portalPoliciesRegulationsCount(Map<String, Object> parameter) {
-        return bContentMapper.portalPoliciesRegulationsCount(parameter);
-    }
-
-}

src/main/java/com/bootdo/common/config/QuartzConfigration.java

@@ -1,50 +0,0 @@
-package com.bootdo.common.config;
-
-import java.io.IOException;
-import java.util.Properties;
-
-import org.quartz.Scheduler;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.PropertiesFactoryBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.scheduling.quartz.SchedulerFactoryBean;
-
-import com.bootdo.common.quartz.factory.JobFactory;
-
-@Configuration
-public class QuartzConfigration {
-
-	@Autowired
-	JobFactory jobFactory;
-
-
-	@Bean
-	public SchedulerFactoryBean schedulerFactoryBean() {
-		SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean();
-		try {
-			schedulerFactoryBean.setOverwriteExistingJobs(true);
-			schedulerFactoryBean.setQuartzProperties(quartzProperties());
-			schedulerFactoryBean.setJobFactory(jobFactory);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return schedulerFactoryBean;
-	}
-
-	// 指定quartz.properties
-	@Bean
-	public Properties quartzProperties() throws IOException {
-		PropertiesFactoryBean propertiesFactoryBean = new PropertiesFactoryBean();
-		propertiesFactoryBean.setLocation(new ClassPathResource("/config/quartz.properties"));
-		propertiesFactoryBean.afterPropertiesSet();
-		return propertiesFactoryBean.getObject();
-	}
-
-	// 创建schedule
-	@Bean(name = "scheduler")
-	public Scheduler scheduler() {
-		return schedulerFactoryBean().getScheduler();
-	}
-}

src/main/java/com/bootdo/common/config/ThirdPartSsoConfig.java

@@ -1,156 +0,0 @@
-package com.bootdo.common.config;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-/**
- * 第三方sso参数配置
- *
- * @author Mr.xiBel
- */
-@Component
-@ConfigurationProperties(prefix = "third-part-sso")
-public class ThirdPartSsoConfig {
-
-	/**
-	 * 开关
-	 */
-	private Boolean switchFlag;
-
-	/**
-	 * 是否直接获取用户名 将跳过通过token再次去获取用户详情
-	 * 不获取用户详情时, 直接使用获取token信息中的user_info
-	 */
-	private Boolean directlyUsername;
-
-	/**
-	 * 客户端的id 提前配置与配置一致
-	 */
-	private String clientId;
-
-	/**
-	 * 客户端秘钥,提前配置与配置一致
-	 */
-	private String clientSecret;
-
-	/**
-	 * 跳转的目标的url,提前配置,与配置一致
-	 */
-	private String systemRedirectUrl;
-
-	/**
-	 * 第三方系统sso地址
-	 */
-	private String ssoRedirectUrl;
-
-	/**
-	 * 4.2 根据code获取token地址
-	 */
-	private String tokenUrl;
-
-	/**
-	 * 4.3 根据token获取用户详情地址
-	 */
-	private String userUrl;
-
-	/**
-	 * 登出地址
-	 */
-	private String LoginoutUrl;
-
-	/**
-	 * 推送过来的用户默认的部门id
-	 */
-	private Long pushDeptId;
-
-
-	public String getLoginoutUrl() {
-		return LoginoutUrl;
-	}
-
-	public void setLoginoutUrl(String loginoutUrl) {
-		LoginoutUrl = loginoutUrl;
-	}
-
-	public Boolean getSwitchFlag() {
-		return switchFlag;
-	}
-
-	public void setSwitchFlag(Boolean switchFlag) {
-		this.switchFlag = switchFlag;
-	}
-
-	public String getClientId() {
-		return clientId;
-	}
-
-	public void setClientId(String clientId) {
-		this.clientId = clientId;
-	}
-
-	public String getClientSecret() {
-		return clientSecret;
-	}
-
-	public void setClientSecret(String clientSecret) {
-		this.clientSecret = clientSecret;
-	}
-
-	public String getSystemRedirectUrl() {
-		return systemRedirectUrl;
-	}
-
-	public void setSystemRedirectUrl(String systemRedirectUrl) {
-		this.systemRedirectUrl = systemRedirectUrl;
-	}
-
-	public String getTokenUrl() {
-		return tokenUrl;
-	}
-
-	/**
-	 * 获取完整 TokenUrl
-	 *
-	 * @param code
-	 * @return
-	 */
-	public String getTokenUrl(String code) {
-		return String.format(tokenUrl, clientId, clientSecret, systemRedirectUrl, code);
-	}
-
-	public void setTokenUrl(String tokenUrl) {
-		this.tokenUrl = tokenUrl;
-	}
-
-	public String getUserUrl() {
-		return userUrl;
-	}
-
-	public void setUserUrl(String userUrl) {
-		this.userUrl = userUrl;
-	}
-
-	public Boolean getDirectlyUsername() {
-		return directlyUsername;
-	}
-
-	public void setDirectlyUsername(Boolean directlyUsername) {
-		this.directlyUsername = directlyUsername;
-	}
-
-	public String getSsoRedirectUrl() {
-		return ssoRedirectUrl;
-	}
-
-	public void setSsoRedirectUrl(String ssoRedirectUrl) {
-		this.ssoRedirectUrl = ssoRedirectUrl;
-	}
-
-	public Long getPushDeptId() {
-		return pushDeptId;
-	}
-
-	public void setPushDeptId(Long pushDeptId) {
-		this.pushDeptId = pushDeptId;
-	}
-}

src/main/java/com/bootdo/common/controller/BaseController.java

@@ -1,12 +1,15 @@
 package com.bootdo.common.controller;
 
-import com.bootdo.system.domain.UserToken;
+
 import org.springframework.stereotype.Controller;
 import com.bootdo.common.utils.ShiroUtils;
 import com.bootdo.system.domain.UserDO;
 
+
 @Controller
 public class BaseController {
+
+
 	public UserDO getUser() {
 		return ShiroUtils.getUser();
 	}
@@ -18,4 +21,5 @@ public class BaseController {
 	public String getUsername() {
 		return getUser().getUsername();
 	}
+
 }

src/main/java/com/bootdo/common/controller/DictController.java

@@ -6,12 +6,15 @@ import com.bootdo.common.service.DictService;
 import com.bootdo.common.utils.PageUtils;
 import com.bootdo.common.utils.Query;
 import com.bootdo.common.utils.R;
+import com.bootdo.common.utils.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -29,6 +32,12 @@ public class DictController extends BaseController {
 	@Autowired
 	private DictService dictService;
 
+	@Value("${sysProvince:#{null}}")
+	public String sysProvince;
+
+	@Value("${sysCity:#{null}}")
+	public String sysCity;
+
 	@Log("访问数据字典")
 	@GetMapping()
 	@RequiresPermissions("common:dict:dict")
@@ -149,11 +158,36 @@ public class DictController extends BaseController {
 	@ResponseBody
 	@GetMapping("/listCity")
 	public List<DictDO> listCity() {
+		List<DictDO> dictList = new ArrayList<>();
+		String province = getUser().getProvince();
+		String city = getUser().getCity();
+
 		// 查询列表数据
 		Map<String, Object> map = new HashMap<>(16);
-		String province = getUser().getProvince();
-		map.put("description", province);//描述
-		List<DictDO> dictList = dictService.list(map);
+		if (StringUtils.isNotEmpty(city)) {
+			DictDO dictDO = new DictDO();
+			dictDO.setName(city);
+			dictDO.setValue(city);
+			dictList.add(dictDO);
+			return dictList;
+		}
+		if (StringUtils.isNotEmpty(sysCity)) {
+			DictDO dictDO = new DictDO();
+			dictDO.setName(sysCity);
+			dictDO.setValue(sysCity);
+			dictList.add(dictDO);
+			return dictList;
+		}
+		if(StringUtils.isNotEmpty(province)){
+			map.put("description", province);//描述
+			dictList = dictService.list(map);
+			return dictList;
+		}
+		if(StringUtils.isNotEmpty(sysProvince)){
+			map.put("description", sysProvince);//描述
+			dictList = dictService.list(map);
+			return dictList;
+		}
 		return dictList;
 	}
 

src/main/java/com/bootdo/common/controller/JobController.java

@@ -1,144 +0,0 @@
-package com.bootdo.common.controller;
-
-import com.bootdo.common.config.Constant;
-import com.bootdo.common.domain.TaskDO;
-import com.bootdo.common.service.JobService;
-import com.bootdo.common.utils.PageUtils;
-import com.bootdo.common.utils.Query;
-import com.bootdo.common.utils.R;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 
- * @author chglee
- * @email 1992lcg@163.com
- * @date 2017-09-26 20:53:48
- */
-@Controller
-@RequestMapping("/common/job")
-public class JobController extends BaseController{
-	@Autowired
-	private JobService taskScheduleJobService;
-
-	@GetMapping()
-	String taskScheduleJob() {
-		return "common/job/job";
-	}
-
-	@ResponseBody
-	@GetMapping("/list")
-	public PageUtils list(@RequestParam Map<String, Object> params) {
-		// 查询列表数据
-		Query query = new Query(params);
-		List<TaskDO> taskScheduleJobList = taskScheduleJobService.list(query);
-		int total = taskScheduleJobService.count(query);
-		PageUtils pageUtils = new PageUtils(taskScheduleJobList, total);
-		return pageUtils;
-	}
-
-	@GetMapping("/add")
-	String add() {
-		return "common/job/add";
-	}
-
-	@GetMapping("/edit/{id}")
-	String edit(@PathVariable("id") Long id, Model model) {
-		TaskDO job = taskScheduleJobService.get(id);
-		model.addAttribute("job", job);
-		return "common/job/edit";
-	}
-
-	/**
-	 * 信息
-	 */
-	@RequestMapping("/info/{id}")
-	public R info(@PathVariable("id") Long id) {
-		TaskDO taskScheduleJob = taskScheduleJobService.get(id);
-		return R.ok().put("taskScheduleJob", taskScheduleJob);
-	}
-
-	/**
-	 * 保存
-	 */
-	@ResponseBody
-	@PostMapping("/save")
-	public R save(TaskDO taskScheduleJob) {
-		if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
-			return R.error(1, "演示系统不允许修改,完整体验请部署程序");
-		}
-		if (taskScheduleJobService.save(taskScheduleJob) > 0) {
-			return R.ok();
-		}
-		return R.error();
-	}
-
-	/**
-	 * 修改
-	 */
-	@ResponseBody
-	@PostMapping("/update")
-	public R update(TaskDO taskScheduleJob) {
-		if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
-			return R.error(1, "演示系统不允许修改,完整体验请部署程序");
-		}
-		taskScheduleJobService.update(taskScheduleJob);
-		return R.ok();
-	}
-
-	/**
-	 * 删除
-	 */
-	@PostMapping("/remove")
-	@ResponseBody
-	public R remove(Long id) {
-		if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
-			return R.error(1, "演示系统不允许修改,完整体验请部署程序");
-		}
-		if (taskScheduleJobService.remove(id) > 0) {
-			return R.ok();
-		}
-		return R.error();
-	}
-
-	/**
-	 * 删除
-	 */
-	@PostMapping("/batchRemove")
-	@ResponseBody
-	public R remove(@RequestParam("ids[]") Long[] ids) {
-		if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
-			return R.error(1, "演示系统不允许修改,完整体验请部署程序");
-		}
-		taskScheduleJobService.batchRemove(ids);
-
-		return R.ok();
-	}
-
-	@PostMapping(value = "/changeJobStatus")
-	@ResponseBody
-	public R changeJobStatus(Long id,String cmd ) {
-		if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
-			return R.error(1, "演示系统不允许修改,完整体验请部署程序");
-		}
-		String label = "停止";
-		if ("start".equals(cmd)) {
-			label = "启动";
-		} else {
-			label = "停止";
-		}
-		try {
-			taskScheduleJobService.changeStatus(id, cmd);
-			return R.ok("任务" + label + "成功");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return R.ok("任务" + label + "失败");
-	}
-
-}

src/main/java/com/bootdo/common/dao/TaskDao.java

@@ -1,32 +0,0 @@
-package com.bootdo.common.dao;
-
-import com.bootdo.common.domain.TaskDO;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 
- * @author chglee
- * @email 1992lcg@163.com
- * @date 2017-10-03 15:45:42
- */
-@Mapper
-public interface TaskDao {
-
-	TaskDO get(Long id);
-	
-	List<TaskDO> list(Map<String,Object> map);
-	
-	int count(Map<String,Object> map);
-	
-	int save(TaskDO task);
-	
-	int update(TaskDO task);
-	
-	int remove(Long id);
-	
-	int batchRemove(Long[] ids);
-}

src/main/java/com/bootdo/common/domain/ScheduleJob.java

@@ -1,135 +0,0 @@
-package com.bootdo.common.domain;
-
-import java.io.Serializable;
-
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-
-@SuppressWarnings("serial")
-public class ScheduleJob implements Serializable ,Job {
-
-	public static final String STATUS_RUNNING = "1";
-	public static final String STATUS_NOT_RUNNING = "0";
-	public static final String CONCURRENT_IS = "1";
-	public static final String CONCURRENT_NOT = "0";
-
-	/**
-	 * 任务名称
-	 */
-	private String jobName;
-	/**
-	 * 任务分组
-	 */
-	private String jobGroup;
-	/**
-	 * 任务状态 是否启动任务
-	 */
-	private String jobStatus;
-	/**
-	 * cron表达式
-	 */
-	private String cronExpression;
-	/**
-	 * 描述
-	 */
-	private String description;
-	/**
-	 * 任务执行时调用哪个类的方法 包名+类名
-	 */
-	private String beanClass;
-	/**
-	 * 任务是否有状态
-	 */
-	private String isConcurrent;
-
-	/**
-	 * Spring bean
-	 */
-	private String springBean;
-
-	/**
-	 * 任务调用的方法名
-	 */
-	private String methodName;
-
-	public String getJobName() {
-		return jobName;
-	}
-
-	public void setJobName(String jobName) {
-		this.jobName = jobName;
-	}
-
-	public String getJobGroup() {
-		return jobGroup;
-	}
-
-	public void setJobGroup(String jobGroup) {
-		this.jobGroup = jobGroup;
-	}
-
-	public String getJobStatus() {
-		return jobStatus;
-	}
-
-	public void setJobStatus(String jobStatus) {
-		this.jobStatus = jobStatus;
-	}
-
-	public String getCronExpression() {
-		return cronExpression;
-	}
-
-	public void setCronExpression(String cronExpression) {
-		this.cronExpression = cronExpression;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public String getBeanClass() {
-		return beanClass;
-	}
-
-	public void setBeanClass(String beanClass) {
-		this.beanClass = beanClass;
-	}
-
-	public String getIsConcurrent() {
-		return isConcurrent;
-	}
-
-	public void setIsConcurrent(String isConcurrent) {
-		this.isConcurrent = isConcurrent;
-	}
-
-	public String getMethodName() {
-		return methodName;
-	}
-
-	public void setMethodName(String methodName) {
-		this.methodName = methodName;
-	}
-
-	public String getSpringBean() {
-		return springBean;
-	}
-
-	public void setSpringBean(String springBean) {
-		this.springBean = springBean;
-	}
-
-	@Override
-	public void execute(JobExecutionContext context) throws JobExecutionException {
-		// TODO Auto-generated method stub
-		
-	}
-
-
-}

src/main/java/com/bootdo/common/domain/TaskDO.java

@@ -1,258 +0,0 @@
-package com.bootdo.common.domain;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author chglee
- * @email 1992lcg@163.com
- * @date 2017-09-25 15:09:21
- */
-public class TaskDO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    //
-    private Long id;
-    // cron表达式
-    private String cronExpression;
-    // 任务调用的方法名
-    private String methodName;
-    // 任务是否有状态
-    private String isConcurrent;
-    // 任务描述
-    private String description;
-    // 更新者
-    private String updateBy;
-    // 任务执行时调用哪个类的方法 包名+类名
-    private String beanClass;
-    // 创建时间
-    private Date createDate;
-    // 任务状态
-    private String jobStatus;
-    // 任务分组
-    private String jobGroup;
-    // 更新时间
-    private Date updateDate;
-    // 创建者
-    private String createBy;
-    // Spring bean
-    private String springBean;
-    // 任务名
-    private String jobName;
-
-    /**
-     * 设置：
-     */
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    /**
-     * 获取：
-     */
-    public Long getId() {
-        return id;
-    }
-
-    /**
-     * 设置：cron表达式
-     */
-    public void setCronExpression(String cronExpression) {
-        this.cronExpression = cronExpression;
-    }
-
-    /**
-     * 获取：cron表达式
-     */
-    public String getCronExpression() {
-        return cronExpression;
-    }
-
-    /**
-     * 设置：任务调用的方法名
-     */
-    public void setMethodName(String methodName) {
-        this.methodName = methodName;
-    }
-
-    /**
-     * 获取：任务调用的方法名
-     */
-    public String getMethodName() {
-        return methodName;
-    }
-
-    /**
-     * 设置：任务是否有状态
-     */
-    public void setIsConcurrent(String isConcurrent) {
-        this.isConcurrent = isConcurrent;
-    }
-
-    /**
-     * 获取：任务是否有状态
-     */
-    public String getIsConcurrent() {
-        return isConcurrent;
-    }
-
-    /**
-     * 设置：任务描述
-     */
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    /**
-     * 获取：任务描述
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * 设置：更新者
-     */
-    public void setUpdateBy(String updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    /**
-     * 获取：更新者
-     */
-    public String getUpdateBy() {
-        return updateBy;
-    }
-
-    /**
-     * 设置：任务执行时调用哪个类的方法 包名+类名
-     */
-    public void setBeanClass(String beanClass) {
-        this.beanClass = beanClass;
-    }
-
-    /**
-     * 获取：任务执行时调用哪个类的方法 包名+类名
-     */
-    public String getBeanClass() {
-        return beanClass;
-    }
-
-    /**
-     * 设置：创建时间
-     */
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    /**
-     * 获取：创建时间
-     */
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    /**
-     * 设置：任务状态
-     */
-    public void setJobStatus(String jobStatus) {
-        this.jobStatus = jobStatus;
-    }
-
-    /**
-     * 获取：任务状态
-     */
-    public String getJobStatus() {
-        return jobStatus;
-    }
-
-    /**
-     * 设置：任务分组
-     */
-    public void setJobGroup(String jobGroup) {
-        this.jobGroup = jobGroup;
-    }
-
-    /**
-     * 获取：任务分组
-     */
-    public String getJobGroup() {
-        return jobGroup;
-    }
-
-    /**
-     * 设置：更新时间
-     */
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-
-    /**
-     * 获取：更新时间
-     */
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    /**
-     * 设置：创建者
-     */
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy;
-    }
-
-    /**
-     * 获取：创建者
-     */
-    public String getCreateBy() {
-        return createBy;
-    }
-
-    /**
-     * 设置：Spring bean
-     */
-    public void setSpringBean(String springBean) {
-        this.springBean = springBean;
-    }
-
-    /**
-     * 获取：Spring bean
-     */
-    public String getSpringBean() {
-        return springBean;
-    }
-
-    /**
-     * 设置：任务名
-     */
-    public void setJobName(String jobName) {
-        this.jobName = jobName;
-    }
-
-    /**
-     * 获取：任务名
-     */
-    public String getJobName() {
-        return jobName;
-    }
-
-    @Override
-    public String toString() {
-        return "TaskDO{" +
-                "id=" + id +
-                ", cronExpression='" + cronExpression + '\'' +
-                ", methodName='" + methodName + '\'' +
-                ", isConcurrent='" + isConcurrent + '\'' +
-                ", description='" + description + '\'' +
-                ", updateBy='" + updateBy + '\'' +
-                ", beanClass='" + beanClass + '\'' +
-                ", createDate=" + createDate +
-                ", jobStatus='" + jobStatus + '\'' +
-                ", jobGroup='" + jobGroup + '\'' +
-                ", updateDate=" + updateDate +
-                ", createBy='" + createBy + '\'' +
-                ", springBean='" + springBean + '\'' +
-                ", jobName='" + jobName + '\'' +
-                '}';
-    }
-}

src/main/java/com/bootdo/common/listenner/ScheduleJobInitListener.java

@@ -1,31 +0,0 @@
-package com.bootdo.common.listenner;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-import com.bootdo.common.quartz.utils.QuartzManager;
-import com.bootdo.common.service.JobService;
-
-@Component
-@Order(value = 1)
-public class ScheduleJobInitListener implements CommandLineRunner {
-
-	@Autowired
-	JobService scheduleJobService;
-
-	@Autowired
-	QuartzManager quartzManager;
-
-	@Override
-	public void run(String... arg0) throws Exception {
-		try {
-			scheduleJobService.initSchedule();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-	}
-
-}

src/main/java/com/bootdo/common/quartz/factory/JobFactory.java

@@ -1,21 +0,0 @@
-package com.bootdo.common.quartz.factory;
-
-import org.quartz.spi.TriggerFiredBundle;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
-import org.springframework.scheduling.quartz.AdaptableJobFactory;
-import org.springframework.stereotype.Component;
-@Component
-public class JobFactory extends AdaptableJobFactory {
-    @Autowired
-    private AutowireCapableBeanFactory capableBeanFactory;
-
-    @Override
-    protected Object createJobInstance(TriggerFiredBundle bundle) throws Exception {
-        //调用父类的方法
-        Object jobInstance = super.createJobInstance(bundle);
-        //进行注入
-        capableBeanFactory.autowireBean(jobInstance);
-        return jobInstance;
-    }
-}

src/main/java/com/bootdo/common/quartz/utils/QuartzManager.java

@@ -1,227 +0,0 @@
-package com.bootdo.common.quartz.utils;
-
-import com.bootdo.common.domain.ScheduleJob;
-import org.quartz.*;
-import org.quartz.DateBuilder.IntervalUnit;
-import org.quartz.impl.matchers.GroupMatcher;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-/**
- * 
- * 
- * @title: QuartzManager.java
- * @description: 计划任务管理
- *
- */
-@Service
-public class QuartzManager {
-	public final Logger log = LoggerFactory.getLogger(QuartzManager.class);
-	// private SchedulerFactoryBean schedulerFactoryBean
-	// =SpringContextHolder.getBean(SchedulerFactoryBean.class);
-	// @Autowired
-	// @Qualifier("schedulerFactoryBean")
-	// private SchedulerFactoryBean schedulerFactoryBean;
-	@Autowired
-	private Scheduler scheduler;
-
-	/**
-	 * 添加任务
-	 * 
-	 * @param scheduleJob
-	 * @throws SchedulerException
-	 */
-	
-	public void addJob(ScheduleJob job) {
-		try {
-			// 创建jobDetail实例，绑定Job实现类
-			// 指明job的名称，所在组的名称，以及绑定job类
-
-			Class<? extends Job> jobClass = (Class<? extends Job>) (Class.forName(job.getBeanClass()).newInstance()
-					.getClass());
-			JobDetail jobDetail = JobBuilder.newJob(jobClass).withIdentity(job.getJobName(), job.getJobGroup())// 任务名称和组构成任务key
-					.build();
-			// 定义调度触发规则
-			// 使用cornTrigger规则
-			Trigger trigger = TriggerBuilder.newTrigger().withIdentity(job.getJobName(), job.getJobGroup())// 触发器key
-					.startAt(DateBuilder.futureDate(1, IntervalUnit.SECOND))
-					.withSchedule(CronScheduleBuilder.cronSchedule(job.getCronExpression())).startNow().build();
-			// 把作业和触发器注册到任务调度中
-			scheduler.scheduleJob(jobDetail, trigger);
-			// 启动
-			if (!scheduler.isShutdown()) {
-				scheduler.start();
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-//	public void addJob(ScheduleJob job) throws SchedulerException {
-//		if (job == null || !ScheduleJob.STATUS_RUNNING.equals(job.getJobStatus())) {
-//			return;
-//		}
-//
-//		TriggerKey triggerKey = TriggerKey.triggerKey(job.getJobName(), job.getJobGroup());
-//
-//		CronTrigger trigger = (CronTrigger) scheduler.getTrigger(triggerKey);
-//
-//		// 不存在，创建一个
-//
-//		if (null == trigger) {
-//			Class<? extends Job> clazz = ScheduleJob.CONCURRENT_IS.equals(job.getIsConcurrent())
-//					? QuartzJobFactory.class
-//					: QuartzJobFactoryDisallowConcurrentExecution.class;
-//
-//			JobDetail jobDetail = JobBuilder.newJob(clazz).withIdentity(job.getJobName(), job.getJobGroup()).build();
-//
-//			jobDetail.getJobDataMap().put("scheduleJob", job);
-//
-//			CronScheduleBuilder scheduleBuilder = CronScheduleBuilder.cronSchedule(job.getCronExpression());
-//
-//			trigger = TriggerBuilder.newTrigger().withIdentity(job.getJobName(), job.getJobGroup())
-//					.withSchedule(scheduleBuilder).build();
-//
-//			scheduler.scheduleJob(jobDetail, trigger);
-//		} else {
-//			// Trigger已存在，那么更新相应的定时设置
-//
-//			CronScheduleBuilder scheduleBuilder = CronScheduleBuilder.cronSchedule(job.getCronExpression());
-//
-//			// 按新的cronExpression表达式重新构建trigger
-//
-//			trigger = trigger.getTriggerBuilder().withIdentity(triggerKey).withSchedule(scheduleBuilder).build();
-//
-//			// 按新的trigger重新设置job执行
-//
-//			scheduler.rescheduleJob(triggerKey, trigger);
-//		}
-//	}
-
-	/**
-	 * 获取所有计划中的任务列表
-	 * 
-	 * @return
-	 * @throws SchedulerException
-	 */
-	public List<ScheduleJob> getAllJob() throws SchedulerException {
-		GroupMatcher<JobKey> matcher = GroupMatcher.anyJobGroup();
-		Set<JobKey> jobKeys = scheduler.getJobKeys(matcher);
-		List<ScheduleJob> jobList = new ArrayList<ScheduleJob>();
-		for (JobKey jobKey : jobKeys) {
-			List<? extends Trigger> triggers = scheduler.getTriggersOfJob(jobKey);
-			for (Trigger trigger : triggers) {
-				ScheduleJob job = new ScheduleJob();
-				job.setJobName(jobKey.getName());
-				job.setJobGroup(jobKey.getGroup());
-				job.setDescription("触发器:" + trigger.getKey());
-				Trigger.TriggerState triggerState = scheduler.getTriggerState(trigger.getKey());
-				job.setJobStatus(triggerState.name());
-				if (trigger instanceof CronTrigger) {
-					CronTrigger cronTrigger = (CronTrigger) trigger;
-					String cronExpression = cronTrigger.getCronExpression();
-					job.setCronExpression(cronExpression);
-				}
-				jobList.add(job);
-			}
-		}
-		return jobList;
-	}
-
-	/**
-	 * 所有正在运行的job
-	 * 
-	 * @return
-	 * @throws SchedulerException
-	 */
-	public List<ScheduleJob> getRunningJob() throws SchedulerException {
-		List<JobExecutionContext> executingJobs = scheduler.getCurrentlyExecutingJobs();
-		List<ScheduleJob> jobList = new ArrayList<ScheduleJob>(executingJobs.size());
-		for (JobExecutionContext executingJob : executingJobs) {
-			ScheduleJob job = new ScheduleJob();
-			JobDetail jobDetail = executingJob.getJobDetail();
-			JobKey jobKey = jobDetail.getKey();
-			Trigger trigger = executingJob.getTrigger();
-			job.setJobName(jobKey.getName());
-			job.setJobGroup(jobKey.getGroup());
-			job.setDescription("触发器:" + trigger.getKey());
-			Trigger.TriggerState triggerState = scheduler.getTriggerState(trigger.getKey());
-			job.setJobStatus(triggerState.name());
-			if (trigger instanceof CronTrigger) {
-				CronTrigger cronTrigger = (CronTrigger) trigger;
-				String cronExpression = cronTrigger.getCronExpression();
-				job.setCronExpression(cronExpression);
-			}
-			jobList.add(job);
-		}
-		return jobList;
-	}
-
-	/**
-	 * 暂停一个job
-	 * 
-	 * @param scheduleJob
-	 * @throws SchedulerException
-	 */
-	public void pauseJob(ScheduleJob scheduleJob) throws SchedulerException {
-		JobKey jobKey = JobKey.jobKey(scheduleJob.getJobName(), scheduleJob.getJobGroup());
-		scheduler.pauseJob(jobKey);
-	}
-
-	/**
-	 * 恢复一个job
-	 * 
-	 * @param scheduleJob
-	 * @throws SchedulerException
-	 */
-	public void resumeJob(ScheduleJob scheduleJob) throws SchedulerException {
-		JobKey jobKey = JobKey.jobKey(scheduleJob.getJobName(), scheduleJob.getJobGroup());
-		scheduler.resumeJob(jobKey);
-	}
-
-	/**
-	 * 删除一个job
-	 * 
-	 * @param scheduleJob
-	 * @throws SchedulerException
-	 */
-	public void deleteJob(ScheduleJob scheduleJob) throws SchedulerException {
-		JobKey jobKey = JobKey.jobKey(scheduleJob.getJobName(), scheduleJob.getJobGroup());
-		scheduler.deleteJob(jobKey);
-
-	}
-
-	/**
-	 * 立即执行job
-	 * 
-	 * @param scheduleJob
-	 * @throws SchedulerException
-	 */
-	public void runAJobNow(ScheduleJob scheduleJob) throws SchedulerException {
-		JobKey jobKey = JobKey.jobKey(scheduleJob.getJobName(), scheduleJob.getJobGroup());
-		scheduler.triggerJob(jobKey);
-	}
-
-	/**
-	 * 更新job时间表达式
-	 * 
-	 * @param scheduleJob
-	 * @throws SchedulerException
-	 */
-	public void updateJobCron(ScheduleJob scheduleJob) throws SchedulerException {
-
-		TriggerKey triggerKey = TriggerKey.triggerKey(scheduleJob.getJobName(), scheduleJob.getJobGroup());
-
-		CronTrigger trigger = (CronTrigger) scheduler.getTrigger(triggerKey);
-
-		CronScheduleBuilder scheduleBuilder = CronScheduleBuilder.cronSchedule(scheduleJob.getCronExpression());
-
-		trigger = trigger.getTriggerBuilder().withIdentity(triggerKey).withSchedule(scheduleBuilder).build();
-
-		scheduler.rescheduleJob(triggerKey, trigger);
-	}
-}

src/main/java/com/bootdo/common/service/JobService.java

@@ -1,38 +0,0 @@
-package com.bootdo.common.service;
-
-import com.bootdo.common.domain.TaskDO;
-
-import java.util.List;
-import java.util.Map;
-
-import org.quartz.SchedulerException;
-
-/**
- * 
- * 
- * @author chglee
- * @email 1992lcg@163.com
- * @date 2017-09-26 20:53:48
- */
-public interface JobService {
-	
-	TaskDO get(Long id);
-	
-	List<TaskDO> list(Map<String, Object> map);
-	
-	int count(Map<String, Object> map);
-	
-	int save(TaskDO taskScheduleJob);
-	
-	int update(TaskDO taskScheduleJob);
-	
-	int remove(Long id);
-	
-	int batchRemove(Long[] ids);
-
-	void initSchedule() throws SchedulerException;
-
-	void changeStatus(Long jobId, String cmd) throws SchedulerException;
-
-	void updateCron(Long jobId) throws SchedulerException;
-}

src/main/java/com/bootdo/common/service/impl/JobServiceImpl.java

@@ -1,123 +0,0 @@
-package com.bootdo.common.service.impl;
-
-import com.bootdo.common.config.Constant;
-import com.bootdo.common.dao.TaskDao;
-import com.bootdo.common.domain.ScheduleJob;
-import com.bootdo.common.domain.TaskDO;
-import com.bootdo.common.quartz.utils.QuartzManager;
-import com.bootdo.common.service.JobService;
-import com.bootdo.common.utils.ScheduleJobUtils;
-import org.quartz.SchedulerException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Service
-public class JobServiceImpl implements JobService {
-
-	@Autowired
-	private TaskDao taskScheduleJobMapper;
-
-	@Autowired
-	QuartzManager quartzManager;
-
-	@Override
-	public TaskDO get(Long id) {
-		return taskScheduleJobMapper.get(id);
-	}
-
-	@Override
-	public List<TaskDO> list(Map<String, Object> map) {
-		return taskScheduleJobMapper.list(map);
-	}
-
-	@Override
-	public int count(Map<String, Object> map) {
-		return taskScheduleJobMapper.count(map);
-	}
-
-	@Override
-	public int save(TaskDO taskScheduleJob) {
-		return taskScheduleJobMapper.save(taskScheduleJob);
-	}
-
-	@Override
-	public int update(TaskDO taskScheduleJob) {
-		return taskScheduleJobMapper.update(taskScheduleJob);
-	}
-
-	@Override
-	public int remove(Long id) {
-		try {
-			TaskDO scheduleJob = get(id);
-			quartzManager.deleteJob(ScheduleJobUtils.entityToData(scheduleJob));
-			return taskScheduleJobMapper.remove(id);
-		} catch (SchedulerException e) {
-			e.printStackTrace();
-			return 0;
-		}
-
-	}
-
-	@Override
-	public int batchRemove(Long[] ids) {
-		for (Long id : ids) {
-			try {
-				TaskDO scheduleJob = get(id);
-				quartzManager.deleteJob(ScheduleJobUtils.entityToData(scheduleJob));
-			} catch (SchedulerException e) {
-				e.printStackTrace();
-				return 0;
-			}
-		}
-		return taskScheduleJobMapper.batchRemove(ids);
-	}
-
-	@Override
-	public void initSchedule() throws SchedulerException {
-		// 这里获取任务信息数据
-		List<TaskDO> jobList = taskScheduleJobMapper.list(new HashMap<String, Object>(16));
-		for (TaskDO scheduleJob : jobList) {
-			if ("1".equals(scheduleJob.getJobStatus())) {
-				ScheduleJob job = ScheduleJobUtils.entityToData(scheduleJob);
-				quartzManager.addJob(job);
-			}
-
-		}
-	}
-
-	@Override
-	public void changeStatus(Long jobId, String cmd) throws SchedulerException {
-		TaskDO scheduleJob = get(jobId);
-		if (scheduleJob == null) {
-			return;
-		}
-		if (Constant.STATUS_RUNNING_STOP.equals(cmd)) {
-			quartzManager.deleteJob(ScheduleJobUtils.entityToData(scheduleJob));
-			scheduleJob.setJobStatus(ScheduleJob.STATUS_NOT_RUNNING);
-		} else {
-			if (!Constant.STATUS_RUNNING_START.equals(cmd)) {
-			} else {
-                scheduleJob.setJobStatus(ScheduleJob.STATUS_RUNNING);
-                quartzManager.addJob(ScheduleJobUtils.entityToData(scheduleJob));
-            }
-		}
-		update(scheduleJob);
-	}
-
-	@Override
-	public void updateCron(Long jobId) throws SchedulerException {
-		TaskDO scheduleJob = get(jobId);
-		if (scheduleJob == null) {
-			return;
-		}
-		if (ScheduleJob.STATUS_RUNNING.equals(scheduleJob.getJobStatus())) {
-			quartzManager.updateJobCron(ScheduleJobUtils.entityToData(scheduleJob));
-		}
-		update(scheduleJob);
-	}
-
-}

src/main/java/com/bootdo/common/task/Job.java

@@ -1,48 +0,0 @@
-package com.bootdo.common.task;
-
-import com.bootdo.common.utils.MD5;
-import com.bootdo.system.domain.SearchDO;
-import com.bootdo.system.service.SearchService;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.messaging.simp.SimpMessagingTemplate;
-import org.springframework.stereotype.Component;
-
-@Component
-public class Job implements org.quartz.Job {
-
-    @Autowired
-    private SearchService searchService;
-
-    @Override
-    public void execute(JobExecutionContext arg0) throws JobExecutionException {
-        // 设备名称
-        String deviceName = "冰箱";
-        // mac地址
-        String mac = "90:C0:0E:17:16:EH";
-        // 序列号
-        String Sn = "232313";
-
-        String uniqe = MD5.getMd5String(deviceName + mac + Sn);
-
-        String uniqeInfo = "732F309B61316A70DAE435095885EEFD";
-        System.out.println("uniqe：" + uniqe + ",uniqeInfo:" + uniqeInfo);
-        System.out.println("测试");
-
-        SearchDO search = new SearchDO();
-        search.setDeviceName(deviceName);
-        search.setDeviceMac(mac);
-        search.setDeviceSn(Sn);
-        search.setLoadUniqe(uniqeInfo);
-        search.setNewUniqe(uniqe);
-        if(uniqeInfo.equals(uniqe)){
-            search.setResult("success");
-        }else{
-            search.setResult("fail");
-        }
-
-        searchService.save(search);
-    }
-
-}

src/main/java/com/bootdo/common/task/WelcomeJob.java

@@ -1,25 +0,0 @@
-package com.bootdo.common.task;
-
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.messaging.simp.SimpMessagingTemplate;
-import org.springframework.stereotype.Component;
-
-import com.bootdo.oa.domain.Response;
-
-import java.security.Principal;
-
-@Component
-public class WelcomeJob implements Job{
-	@Autowired
-	SimpMessagingTemplate template;
-
-    @Override
-    public void execute(JobExecutionContext arg0) throws JobExecutionException {
-    	//template.convertAndSend("/topic/getResponse", new Response("欢迎体验bootdo,这是一个任务计划，使用了websocket和quzrtz技术，可以在计划列表中取消，欢迎您加入qq群交流学习!" ));
-    //
-    }
-
-}

src/main/java/com/bootdo/common/utils/EhcacheUtil.java

@@ -1,11 +1,10 @@
 package com.bootdo.common.utils;
 
-import com.bootdo.data.entity.TfInfoEnterprise;
+
 import com.bootdo.portal.common.CommonConstants;
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Element;
-import org.apache.poi.ss.formula.functions.T;
 
 import java.net.URL;
 
@@ -76,13 +75,5 @@ public class EhcacheUtil {
         EhcacheUtil.getInstance().remove(CommonConstants.CACHE_PORTAL_USER, token);
     }
 
-    /**
-     * 获取用户信息
-     *
-     * @param token
-     * @return
-     */
-    public TfInfoEnterprise getUserByToken(String token) {
-        return (TfInfoEnterprise) EhcacheUtil.getInstance().get(CommonConstants.CACHE_PORTAL_USER, token);
-    }
+
 }

src/main/java/com/bootdo/common/utils/ScheduleJobUtils.java

@@ -1,20 +0,0 @@
-package com.bootdo.common.utils;
-
-import com.bootdo.common.domain.ScheduleJob;
-import com.bootdo.common.domain.TaskDO;
-
-public class ScheduleJobUtils {
-	public static ScheduleJob entityToData(TaskDO scheduleJobEntity) {
-		ScheduleJob scheduleJob = new ScheduleJob();
-		scheduleJob.setBeanClass(scheduleJobEntity.getBeanClass());
-		scheduleJob.setCronExpression(scheduleJobEntity.getCronExpression());
-		scheduleJob.setDescription(scheduleJobEntity.getDescription());
-		scheduleJob.setIsConcurrent(scheduleJobEntity.getIsConcurrent());
-		scheduleJob.setJobName(scheduleJobEntity.getJobName());
-		scheduleJob.setJobGroup(scheduleJobEntity.getJobGroup());
-		scheduleJob.setJobStatus(scheduleJobEntity.getJobStatus());
-		scheduleJob.setMethodName(scheduleJobEntity.getMethodName());
-		scheduleJob.setSpringBean(scheduleJobEntity.getSpringBean());
-		return scheduleJob;
-	}
-}

src/main/java/com/bootdo/data/controller/CaInfoController.java

@@ -1,125 +0,0 @@
-package com.bootdo.data.controller;
-
-import com.bootdo.common.annotation.Log;
-import com.bootdo.common.utils.PageUtils;
-import com.bootdo.common.utils.Query;
-import com.bootdo.common.utils.R;
-import com.bootdo.data.domain.CaInfo;
-import com.bootdo.data.entity.TfInfoEnterprise;
-import com.bootdo.data.service.CaInfoService;
-import com.bootdo.data.service.TfInfoEnterpriseService;
-import com.bootdo.data.util.ApplyCertUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-/**
- * ca证书 控制层
- *
- * @author Mr.xiBel
- * @since 2022-05-20 15:51:40
- */
-@Controller
-@RequestMapping("/data/caInfo")
-public class CaInfoController {
-    /**
-     * 服务对象
-     */
-    @Resource
-    private TfInfoEnterpriseService tfInfoEnterpriseService;
-
-    /**
-     * 证书信息 服务对象
-     */
-    @Resource
-    private CaInfoService caInfoService;
-
-    @Log("访问证书信息")
-    @GetMapping()
-    @RequiresPermissions("caInfo:info:list")
-    String dataInfo() {
-        return "data/caInfo/dataInfo";
-    }
-
-    /**
-     * 分页获取数据
-     *
-     * @param params
-     * @return
-     */
-    @ResponseBody
-    @GetMapping("/list")
-    @RequiresPermissions("caInfo:info:list")
-    public PageUtils list(@RequestParam Map<String, Object> params) {
-        // 查询列表数据
-        Query query = new Query(params);
-        List<CaInfo> dataInfoList = caInfoService.queryPage(query);
-        int total = caInfoService.queryPageCount(query);
-        return new PageUtils(dataInfoList, total);
-    }
-
-
-    /**
-     * 通过主键查询单条数据
-     *
-     * @param id
-     * @param model
-     * @return
-     */
-    @Log("访问证书信息-详情")
-    @GetMapping("/edit/{id}")
-    @RequiresPermissions("caInfo:info:update")
-    String edit(@PathVariable("id") Integer id, Model model) {
-        CaInfo data = this.caInfoService.queryById(id);
-        model.addAttribute("data", data);
-        return "data/caInfo/edit";
-    }
-
-    /**
-     * 通过主键查询单条数据
-     *
-     * @param id 主键
-     * @return 单条数据
-     */
-    @GetMapping("/edit")
-    @RequiresPermissions("caInfo:info:update")
-    public CaInfo selectOne(Integer id) {
-        return this.caInfoService.queryById(id);
-    }
-
-
-    @Log("删除证书信息")
-    @PostMapping("/remove")
-    @RequiresPermissions("caInfo:info:remove")
-    @ResponseBody
-    public R disable(Integer id) throws Exception {
-        caInfoService.caStatusUpdate(id, 0);
-        return R.ok();
-    }
-
-
-    /**
-     * 证书申请 审核
-     * 这里 审核通过时, 需要生成证书
-     * 具体逻辑 参见实现
-     *
-     * @param id
-     * @param caStatus
-     * @return
-     */
-
-    @Log("更新证书信息状态")
-    @PostMapping("/application")
-    @RequiresPermissions("caInfo:info:status")
-    @ResponseBody
-    public R application(Integer id, Integer caStatus) throws Exception {
-        caInfoService.caStatusUpdate(id, caStatus);
-        return R.ok();
-    }
-}

src/main/java/com/bootdo/data/controller/DataApplyController.java

@@ -1,134 +0,0 @@
-package com.bootdo.data.controller;
-
-import java.util.List;
-import java.util.Map;
-
-import com.bootdo.common.utils.ShiroUtils;
-import com.bootdo.system.domain.UserDO;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.ui.Model;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.bootdo.data.domain.DataApplyDO;
-import com.bootdo.data.service.DataApplyService;
-import com.bootdo.common.utils.PageUtils;
-import com.bootdo.common.utils.Query;
-import com.bootdo.common.utils.R;
-
-/**
- * 数据备案表
- * 
- * @author admin
- * @email admin@163.com
- * @date 2022-03-01 14:23:15
- */
- 
-@Controller
-@RequestMapping("/data/dataApply")
-public class DataApplyController {
-
-	private static Logger log = LoggerFactory.getLogger(DataApplyController.class);
-
-	@Autowired
-	private DataApplyService dataApplyService;
-	
-	@GetMapping()
-	@RequiresPermissions("data:dataApply:dataApply")
-	String DataApply(){
-	    return "data/dataApply/dataApply";
-	}
-	
-	@ResponseBody
-	@GetMapping("/list")
-	@RequiresPermissions("data:dataApply:dataApply")
-	public PageUtils list(@RequestParam Map<String, Object> params){
-		//查询列表数据
-        Query query = new Query(params);
-		List<DataApplyDO> dataApplyList = dataApplyService.list(query);
-		int total = dataApplyService.count(query);
-		PageUtils pageUtils = new PageUtils(dataApplyList, total);
-		return pageUtils;
-	}
-	
-	@GetMapping("/add")
-	@RequiresPermissions("data:dataApply:add")
-	String add(){
-	    return "data/dataApply/add";
-	}
-
-	@GetMapping("/edit/{id}")
-	@RequiresPermissions("data:dataApply:edit")
-	String edit(@PathVariable("id") Long id,Model model){
-		DataApplyDO dataApply = dataApplyService.get(id);
-		model.addAttribute("dataApply", dataApply);
-	    return "data/dataApply/edit";
-	}
-	
-	/**
-	 * 保存
-	 */
-	@ResponseBody
-	@PostMapping("/save")
-	@RequiresPermissions("data:dataApply:add")
-	public R save( DataApplyDO dataApply){
-		UserDO currUser = ShiroUtils.getUser();
-		log.info("currUser:" + currUser.toString());
-		if (null == currUser) {
-			dataApply.setUploadUserid("-1");
-			dataApply.setUploadUser("获取用户信息为空");
-		} else {
-			dataApply.setUploadUserid(String.valueOf(ShiroUtils.getUserId()));
-			dataApply.setUploadUser(ShiroUtils.getUser().getUsername());
-		}
-		dataApply.setStatus("0");
-		if(dataApplyService.save(dataApply)>0){
-			return R.ok();
-		}
-		return R.error();
-	}
-	/**
-	 * 修改
-	 */
-	@ResponseBody
-	@RequestMapping("/update")
-	@RequiresPermissions("data:dataApply:edit")
-	public R update( DataApplyDO dataApply){
-		dataApplyService.update(dataApply);
-		return R.ok();
-	}
-	
-	/**
-	 * 删除
-	 */
-	@PostMapping( "/remove")
-	@ResponseBody
-	@RequiresPermissions("data:dataApply:remove")
-	public R remove( Long id){
-		if(dataApplyService.remove(id)>0){
-		return R.ok();
-		}
-		return R.error();
-	}
-	
-	/**
-	 * 删除
-	 */
-	@PostMapping( "/batchRemove")
-	@ResponseBody
-	@RequiresPermissions("data:dataApply:batchRemove")
-	public R remove(@RequestParam("ids[]") Long[] ids){
-		dataApplyService.batchRemove(ids);
-		return R.ok();
-	}
-	
-}

src/main/java/com/bootdo/data/controller/DataApprovalController.java

@@ -1,295 +0,0 @@
-package com.bootdo.data.controller;
-
-import com.bootdo.common.annotation.Log;
-import com.bootdo.common.utils.*;
-import com.bootdo.data.domain.DataApprovalDO;
-import com.bootdo.data.domain.UnitApplyInfoDO;
-import com.bootdo.data.service.DataApprovalService;
-import com.bootdo.data.service.UnitInfoService;
-import com.bootdo.system.domain.UserDO;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 审批
- * @Author: wangp
- * @Date: 2022/3/2 14:06
- */
-@Controller
-@RequestMapping("/data/dataApproval")
-public class DataApprovalController {
-
-    private static Logger log = LoggerFactory.getLogger(UnitInfoController.class);
-
-    @Autowired
-    private UnitInfoService unitInfoService;
-
-    @Autowired
-    private DataApprovalService dataApprovalService;
-
-    @Log("访问备案审核")
-    @GetMapping()
-    @RequiresPermissions("data:dataApproval:dataApproval")
-    String DataApproval() {
-        return "data/dataApproval/dataApproval";
-    }
-
-    @ResponseBody
-    @GetMapping("/list")
-    @RequiresPermissions("data:dataApproval:dataApproval")
-    public PageUtils list(@RequestParam Map<String, Object> params) {
-        // 查询列表数据
-        Query query = new Query(params);
-        List<UnitApplyInfoDO> dataApprovalList = dataApprovalService.list(query);
-        int total = dataApprovalService.count(query);
-        PageUtils pageUtils = new PageUtils(dataApprovalList, total);
-        return pageUtils;
-    }
-
-    /**
-     * @Description: 备案详情
-     * @Author: wangp
-     * @Date: 2022/3/2 10:34
-     * @param param
-     * @param model
-     * @Return: String
-     */
-    @GetMapping("/edit/{param}")
-    @RequiresPermissions("data:unitInfo:unitInfo")
-    String edit(@PathVariable("param") String param, Model model) {
-        log.info("param:" + param);
-        UserDO currUser = ShiroUtils.getUser();
-        // 查询列表数据
-        Map<String, Object> map = new HashMap<>(16);
-        map.put("uploadUserid", currUser.getUserId());
-        map.put("id", param);
-        List<UnitApplyInfoDO> list = unitInfoService.listEditInfo(map);
-        UnitApplyInfoDO unitInfo = new UnitApplyInfoDO();
-        if (list != null && list.size() > 0) {
-            // 已维护过
-            unitInfo = list.get(0);
-            // model.addAttribute("unitInfo", unitInfo);
-            // return "data/unitInfo/edit";
-        }
-        model.addAttribute("unitInfo", unitInfo);
-        log.info("param:" + param);
-        model.addAttribute("paramInfo", param);
-        model.addAttribute("pName", "根数据");
-        return "/data/dataApproval/verifyInfo";
-    }
-
-    /**
-     * @Description: 详情页面 审核通过 /驳回
-     * @Author: wangp
-     * @Date: 2022/3/2 15:00
-     * @param dataApproval
-     * @Return: R
-     */
-    @ResponseBody
-    @PostMapping("/verifyInfo")
-    @RequiresPermissions("data:dataApproval:verify")
-    public R verifyInfo(DataApprovalDO dataApproval) {
-        log.info("dataApproval:" + dataApproval.toString());
-        UserDO currUser = ShiroUtils.getUser();
-        log.info("currUser:" + currUser.toString());
-        if (null == currUser) {
-            dataApproval.setApprovalUserid("-1");
-            dataApproval.setApprovalUser("获取用户信息为空");
-        } else {
-            dataApproval.setApprovalUserid(String.valueOf(ShiroUtils.getUserId()));
-            dataApproval.setApprovalUser(ShiroUtils.getUser().getUsername());
-        }
-        if (dataApprovalService.verifyInfo(dataApproval) > 0) {
-            return R.ok();
-        }
-        return R.error();
-    }
-
-    /**
-     * 修改
-     */
-    @ResponseBody
-    @RequestMapping("/update")
-    @RequiresPermissions("data:dataApproval:edit")
-    public R update(DataApprovalDO dataApproval) {
-        dataApprovalService.update(dataApproval);
-        return R.ok();
-    }
-
-    /**
-     * @Description: 列表页面 审核通过
-     * @Author: wangp
-     * @Date: 2022/3/3 10:11
-     * @param applyId
-     * @Return: R
-     */
-    @PostMapping("/verify")
-    @ResponseBody
-    @RequiresPermissions("data:dataApproval:verify")
-    public R verify(Long applyId) {
-        log.info("审核通过 备案主键 applyId:" + applyId);
-        String status = "0";// dataApproval.getStatus() 审批状态 0:通过 1:驳回 3:取消
-        String desc = "审核同意";
-        if (dataApprovalService.approval(applyId, status, desc)) {
-            return R.ok();
-        }
-        return R.error();
-    }
-
-    /**
-     * @Description: 批量审核
-     * @Author: wangp
-     * @Date: 2022/3/3 14:10
-     * @param ids
-     * @Return: R
-     */
-    @PostMapping("/batchVerify")
-    @ResponseBody
-    @RequiresPermissions("data:dataApproval:verify")
-    public R batchVerify(@RequestParam("ids[]") Long[] ids) {
-        log.info("审核通过 备案主键 ids:" + ids.toString());
-        String status = "0";// dataApproval.getStatus() 审批状态 0:通过 1:驳回 3:取消
-        String desc = "审核同意";
-        // 审批数据遍历
-        for (Long applyId : ids) {
-            log.info("审核通过 备案主键 applyId:" + applyId);
-            // 查询数组是否需要审核
-            Map<String, Object> params = new HashMap<>();
-            params.put("applyId", applyId);
-            List<UnitApplyInfoDO> list = dataApprovalService.viewList(params);
-            UnitApplyInfoDO unitApplyInfoDO = null;
-            if (list != null && list.size() > 0) {
-                unitApplyInfoDO = list.get(0);
-            }
-            log.info("staus" + unitApplyInfoDO.getApprovalStatus());
-            // staus为空处于待审核状态 // dataApproval.getStatus() 审批状态 0:通过 1:驳回 3:取消
-            if (StringUtils.isBlank(unitApplyInfoDO.getApprovalStatus())) {
-                log.info("备案主键 applyId:" + applyId + " ,状态staus:" + unitApplyInfoDO.getApprovalStatus());
-                dataApprovalService.approval(applyId, status, desc);
-            } else {
-                log.info("备案主键 applyId:" + applyId + " 无需审核");
-            }
-        }
-        return R.ok();
-    }
-
-    /**
-     * @Description: 列表页面 驳回
-     * @Author: wangp
-     * @Date: 2022/3/3 10:11
-     * @param applyId
-     * @Return: R
-     */
-    @PostMapping("/rebut")
-    @ResponseBody
-    @RequiresPermissions("data:dataApproval:rebut")
-    public R rebut(Long applyId) {
-        log.info("驳回 备案主键 applyId:" + applyId);
-        String status = "1";// dataApproval.getStatus() 审批状态 0:通过 1:驳回 3:取消
-        String desc = "驳回";
-        if (dataApprovalService.approval(applyId, status, desc)) {
-            return R.ok();
-        }
-        return R.error();
-    }
-
-    /**
-     * @Description: 批量审核
-     * @Author: wangp
-     * @Date: 2022/3/3 14:10
-     * @param ids
-     * @Return: R
-     */
-    @PostMapping("/batchRebut")
-    @ResponseBody
-    @RequiresPermissions("data:dataApproval:rebut")
-    public R batchRebut(@RequestParam("ids[]") Long[] ids) {
-        log.info("审核通过 备案主键 ids:" + ids);
-        String status = "1";// dataApproval.getStatus() 审批状态 0:通过 1:驳回 3:取消
-        String desc = "驳回";
-        for (Long applyId : ids) {
-            log.info("审核通过 备案主键 applyId:" + applyId);
-            // 查询数组是否需要审核
-            Map<String, Object> params = new HashMap<>();
-            params.put("applyId", applyId);
-            List<UnitApplyInfoDO> list = dataApprovalService.viewList(params);
-            UnitApplyInfoDO unitApplyInfoDO = null;
-            if (list != null && list.size() > 0) {
-                unitApplyInfoDO = list.get(0);
-            }
-            log.info("staus" + unitApplyInfoDO.getApprovalStatus());
-            // staus为空处于待审核状态 // dataApproval.getStatus() 审批状态 0:通过 1:驳回 3:取消
-            if (StringUtils.isBlank(unitApplyInfoDO.getApprovalStatus())) {
-                log.info("备案主键 applyId:" + applyId + " ,状态staus:" + unitApplyInfoDO.getApprovalStatus());
-                dataApprovalService.approval(applyId, status, desc);
-            } else {
-                log.info("备案主键 applyId:" + applyId + " 无需审核");
-            }
-        }
-        return R.ok();
-    }
-
-    /**
-     * @Description: 列表页面 取消
-     * @Author: wangp
-     * @Date: 2022/3/3 10:11
-     * @param applyId
-     * @Return: R
-     */
-    @PostMapping("/cancel")
-    @ResponseBody
-    @RequiresPermissions("data:dataApproval:rebut")
-    public R cancel(Long applyId) {
-        log.info("取消 备案主键 applyId:" + applyId);
-        String status = "3";// dataApproval.getStatus() 审批状态 0:通过 1:驳回 3:取消
-        String desc = "";
-        if (dataApprovalService.approval(applyId, status, desc)) {
-            return R.ok();
-        }
-        return R.error();
-    }
-
-    /**
-     * 删除
-     */
-    @PostMapping("/batchRemove")
-    @ResponseBody
-    @RequiresPermissions("data:dataApproval:batchRemove")
-    public R remove(@RequestParam("ids[]") Long[] ids) {
-        dataApprovalService.batchRemove(ids);
-        return R.ok();
-    }
-
-    @GetMapping("/view/{applyId}")
-    @RequiresPermissions("data:dataApproval:view")
-    String view(@PathVariable("applyId") String applyId, Model model) {
-        log.info("applyId:" + applyId);
-        UserDO currUser = ShiroUtils.getUser();
-        // 查询列表数据
-        Map<String, Object> params = new HashMap<>();
-        params.put("applyId", applyId);
-        List<UnitApplyInfoDO> list = dataApprovalService.viewList(params);
-        UnitApplyInfoDO unitApplyInfoDO = null;
-        if (list != null && list.size() > 0) {
-            // 已维护过
-            unitApplyInfoDO = list.get(0);
-            // model.addAttribute("unitInfo", unitInfo);
-            // return "data/unitInfo/edit";
-        }
-        log.info("unitApplyInfoDO:" + unitApplyInfoDO.toString());
-        model.addAttribute("unitInfo", unitApplyInfoDO);
-        log.info("param:" + applyId);
-        model.addAttribute("paramInfo", applyId);
-        return "/data/dataApproval/viewInfo";
-    }
-
-}

src/main/java/com/bootdo/data/controller/DataInfoController.java

@@ -1,175 +0,0 @@
-package com.bootdo.data.controller;
-
-import com.bootdo.common.annotation.Log;
-import com.bootdo.common.service.DictService;
-import com.bootdo.common.utils.PageUtils;
-import com.bootdo.common.utils.Query;
-import com.bootdo.common.utils.R;
-import com.bootdo.common.utils.ShiroUtils;
-import com.bootdo.data.domain.DataInfoDO;
-import com.bootdo.data.service.DataInfoService;
-import com.bootdo.system.domain.UserDO;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 重要数据表
- * 
- * @author admin
- * @email admin@163.com
- * @date 2022-02-27 17:27:36
- */
-
-@Controller
-@RequestMapping("/data/dataInfo")
-public class DataInfoController {
-
-    private static Logger log = LoggerFactory.getLogger(DataInfoController.class);
-
-    @Autowired
-    private DataInfoService dataInfoService;
-
-    @Autowired
-    private DictService dictService;
-
-    @Log("访问数据填报")
-    @GetMapping()
-    @RequiresPermissions("data:dataInfo:dataInfo")
-    String DataInfo() {
-        return "data/dataInfo/dataInfo";
-    }
-
-    /**
-     * @Description: 上报数据整理
-     * @Author: wangp
-     * @Date: 2022/3/1 0:27
-     * @param params
-     * @Return: PageUtils
-     */
-    @ResponseBody
-    @GetMapping("/list")
-    @RequiresPermissions("data:dataInfo:dataInfo")
-    public PageUtils list(@RequestParam Map<String, Object> params) {
-        // 查询列表数据
-        Query query = new Query(params);
-        List<DataInfoDO> dataInfoList = dataInfoService.list(query);
-        int total = dataInfoService.count(query);
-        PageUtils pageUtils = new PageUtils(dataInfoList, total);
-        return pageUtils;
-    }
-
-    @ResponseBody
-    @GetMapping("/Querylist")
-    @RequiresPermissions("data:dataPart:dataPart")
-    public List<DataInfoDO> Querylist(@RequestParam Map<String, Object> params) {
-        // 查询列表数据
-        List<DataInfoDO> dataPartList = dataInfoService.list(params);
-        return dataPartList;
-    }
-
-    /**
-     * @Description:重要数据和核心数据目录备案清单 初始化
-     * @Author: wangp
-     * @Date: 2022/3/1 19:05
-     * @param params
-     * @Return: List<DataInfoDO>
-     */
-    @ResponseBody
-    @GetMapping("/Querylist/{param}")
-    @RequiresPermissions("data:dataPart:dataPart")
-    public List<DataInfoDO> querylistInfo(@PathVariable("param") String param,
-        @RequestParam Map<String, Object> params) {
-        log.info("param:" + param);
-        // 查询列表数据
-        List<DataInfoDO> dataPartList = new ArrayList<>();
-        if (!"flag".equals(param)) {
-            UserDO currUser = ShiroUtils.getUser();
-            params.put("uploadUserid", currUser.getUserId());
-            dataPartList = dataInfoService.querylistInfo(params);
-        }
-        return dataPartList;
-    }
-
-    @GetMapping("/add")
-    @RequiresPermissions("data:dataInfo:add")
-    String add() {
-        return "data/dataInfo/add";
-    }
-
-    @GetMapping("/edit/{id}")
-    @RequiresPermissions("data:dataInfo:edit")
-    String edit(@PathVariable("id") Long id, Model model) {
-        DataInfoDO dataInfo = dataInfoService.get(id);
-        model.addAttribute("dataInfo", dataInfo);
-        // model.addAttribute("dataTypes", dictDOS);
-        return "data/dataInfo/edit";
-    }
-
-    /**
-     * 保存
-     */
-    @ResponseBody
-    @PostMapping("/save")
-    @RequiresPermissions("data:dataInfo:add")
-    public R save(DataInfoDO dataInfo) {
-        UserDO currUser = ShiroUtils.getUser();
-        log.info("currUser:" + currUser.toString());
-        if (null == currUser) {
-            dataInfo.setUploadUserid("-1");
-            dataInfo.setUploadUser("获取用户信息为空");
-        } else {
-            dataInfo.setUploadUserid(String.valueOf(ShiroUtils.getUserId()));
-            dataInfo.setUploadUser(ShiroUtils.getUser().getUsername());
-        }
-        dataInfo.setDataStatus("0"); //状态 0:正常 1:删除 2:已上报 3:通过审核 4:驳回
-        if (dataInfoService.save(dataInfo) > 0) {
-            return R.ok();
-        }
-        return R.error();
-    }
-
-    /**
-     * 修改
-     */
-    @ResponseBody
-    @RequestMapping("/update")
-    @RequiresPermissions("data:dataInfo:edit")
-    public R update(DataInfoDO dataInfo) {
-        dataInfoService.update(dataInfo);
-        return R.ok();
-    }
-
-    /**
-     * 删除
-     */
-    @PostMapping("/remove")
-    @ResponseBody
-    @RequiresPermissions("data:dataInfo:remove")
-    public R remove(Long id) {
-        if (dataInfoService.remove(id) > 0) {
-            return R.ok();
-        }
-        return R.error();
-    }
-
-    /**
-     * 删除
-     */
-    @PostMapping("/batchRemove")
-    @ResponseBody
-    @RequiresPermissions("data:dataInfo:batchRemove")
-    public R remove(@RequestParam("ids[]") Long[] ids) {
-        dataInfoService.batchRemove(ids);
-        return R.ok();
-    }
-
-}

src/main/java/com/bootdo/data/controller/DataPartController.java

@@ -1,176 +0,0 @@
-package com.bootdo.data.controller;
-
-import com.bootdo.common.annotation.Log;
-import com.bootdo.common.utils.R;
-import com.bootdo.data.domain.DataPartDO;
-import com.bootdo.data.service.DataPartService;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 分类分级
- * 
- * @author admin
- * @email admin@163.com
- * @date 2022-02-27 23:33:17
- */
-
-@Controller
-@RequestMapping("/data/dataPart")
-public class DataPartController {
-
-    private static Logger log = LoggerFactory.getLogger(DataPartController.class);
-
-    @Autowired
-    private DataPartService dataPartService;
-
-    @Log("访问分类参考")
-    @GetMapping()
-    @RequiresPermissions("data:dataPart:dataPart")
-    String DataPart() {
-        return "data/dataPart/dataPart";
-    }
-
-    @Log("访问分类参考")
-    @GetMapping("dataPartView")
-    @RequiresPermissions("data:dataPart:dataPart")
-    String DataPartView() {
-        return "data/dataPart/dataPartView";
-    }
-
-    @ResponseBody
-    @GetMapping("/list")
-    @RequiresPermissions("data:dataPart:dataPart")
-    public List<DataPartDO> list(@RequestParam Map<String, Object> params) {
-        // 查询列表数据
-        List<DataPartDO> dataPartList = dataPartService.list(params);
-        return dataPartList;
-    }
-
-
-    @Log("添加分类数据")
-    @RequiresPermissions("data:dataPart:add")
-    @GetMapping("/add/{pId}")
-    String add(Model model, @PathVariable("pId") Long pId) {
-        model.addAttribute("pId", pId);
-        if (pId == 0) {
-            model.addAttribute("pName", "根数据");
-        } else {
-            model.addAttribute("pName", dataPartService.get(pId).getPartName());
-        }
-        return "data/dataPart/add";
-    }
-
-    @Log("编辑分类数据")
-    @RequiresPermissions("data:dataPart:edit")
-    @GetMapping("/edit/{id}")
-    String edit(Model model, @PathVariable("id") Long id) {
-        DataPartDO dataPart = dataPartService.get(id);
-        Long pId = dataPart.getParentId();
-        model.addAttribute("pId", pId);
-        if (pId == 0) {
-            model.addAttribute("pName", "根数据");
-        } else {
-            model.addAttribute("pName", dataPartService.get(pId).getPartName());
-        }
-        log.info("dataPart:" + dataPart.toString());
-        model.addAttribute("dataPart", dataPart);
-        return "data/dataPart/edit";
-    }
-
-    /**
-     * 保存
-     */
-    @ResponseBody
-    @PostMapping("/save")
-    @RequiresPermissions("data:dataPart:add")
-    public R save(DataPartDO dataPart) {
-        dataPart.setDelFlag(0);
-        if (dataPartService.save(dataPart) > 0) {
-            return R.ok();
-        }
-        return R.error();
-    }
-
-    /**
-     * 修改
-     */
-    @ResponseBody
-    @RequestMapping("/update")
-    @RequiresPermissions("data:dataPart:edit")
-    public R update(DataPartDO dataPart) {
-        dataPartService.update(dataPart);
-        return R.ok();
-    }
-
-    /**
-     * 删除
-     */
-    @PostMapping("/remove")
-    @ResponseBody
-    @RequiresPermissions("data:dataPart:remove")
-    public R remove(Long partId) {
-        if (dataPartService.remove(partId) > 0) {
-            return R.ok();
-        }
-        return R.error();
-    }
-
-    /**
-     * 删除
-     */
-    @PostMapping("/batchRemove")
-    @ResponseBody
-    @RequiresPermissions("data:dataPart:batchRemove")
-    public R remove(@RequestParam("ids[]") Long[] partIds) {
-        dataPartService.batchRemove(partIds);
-        return R.ok();
-    }
-
-    
-    /**
-     * @Description: 数据分类查询
-     * @Author: wangp
-     * @Date: 2022/2/28 13:06
-     * @param partId
-     * @param parentId
-     * @Return: List<DataPartDO>
-     */
-    @ResponseBody
-    @GetMapping("/list/{partId}/{parentId}")
-    public List<DataPartDO> listByTypeParentID(@PathVariable("partId") String partId, @PathVariable("parentId") String parentId) {
-        // 查询列表数据
-        Map<String, Object> map = new HashMap<>(16);
-        map.put("partId", partId);
-        map.put("parentId", parentId);
-        List<DataPartDO> list = dataPartService.list(map);
-        return list;
-    }
-
-    /**
-     * @Description: 数据分类查询
-     * @Author: wangp
-     * @Date: 2022/2/28 13:06
-     * @param parentId
-     * @Return: List<DataPartDO>
-     */
-    @ResponseBody
-    @GetMapping("/list/{parentId}")
-    public List<DataPartDO> listParentID(@PathVariable("parentId") String parentId) {
-        // 查询列表数据
-        Map<String, Object> map = new HashMap<>(16);
-        map.put("parentId", parentId);
-        List<DataPartDO> list = dataPartService.list(map);
-        return list;
-    }
-
-}

src/main/java/com/bootdo/data/controller/DataUploadController.java

@@ -1,111 +0,0 @@
-package com.bootdo.data.controller;
-
-import java.util.List;
-import java.util.Map;
-
-import com.bootdo.common.annotation.Log;
-import com.bootdo.data.domain.DataUploadDO;
-import com.bootdo.data.service.DataUploadService;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import com.bootdo.common.utils.PageUtils;
-import com.bootdo.common.utils.Query;
-import com.bootdo.common.utils.R;
-
-/**
- * @Description: 重要数据
- * @Author: wangp
- * @Date: 2022/2/27 14:49
- */
-@Controller
-@RequestMapping("/data/dataUpload")
-public class DataUploadController {
-    @Autowired
-    private DataUploadService dataUploadService;
-
-    @Log("请求重要数据")
-    @GetMapping()
-    @RequiresPermissions("data:dataUpload:dataUpload")
-    String DataUpload() {
-        return "data/dataUpload/dataUpload";
-    }
-
-    @ResponseBody
-    @GetMapping("/list")
-    @RequiresPermissions("data:dataUpload:dataUpload")
-    public PageUtils list(@RequestParam Map<String, Object> params) {
-        // 查询列表数据
-        Query query = new Query(params);
-        List<DataUploadDO> dataUploadList = dataUploadService.list(query);
-        int total = dataUploadService.count(query);
-        PageUtils pageUtils = new PageUtils(dataUploadList, total);
-        return pageUtils;
-    }
-
-    @GetMapping("/add")
-    @RequiresPermissions("data:dataUpload:add")
-    String add() {
-        return "data/dataUpload/add";
-    }
-
-    @GetMapping("/edit/{id}")
-    @RequiresPermissions("data:dataUpload:edit")
-    String edit(@PathVariable("id") Long id, Model model) {
-        DataUploadDO dataUpload = dataUploadService.get(id);
-        model.addAttribute("dataUpload", dataUpload);
-        return "data/dataUpload/edit";
-    }
-
-    /**
-     * 保存
-     */
-    @ResponseBody
-    @PostMapping("/save")
-    @RequiresPermissions("data:dataUpload:add")
-    public R save(DataUploadDO dataUpload) {
-        if (dataUploadService.save(dataUpload) > 0) {
-            return R.ok();
-        }
-        return R.error();
-    }
-
-    /**
-     * 修改
-     */
-    @ResponseBody
-    @RequestMapping("/update")
-    @RequiresPermissions("data:dataUpload:edit")
-    public R update(DataUploadDO dataUpload) {
-        dataUploadService.update(dataUpload);
-        return R.ok();
-    }
-
-    /**
-     * 删除
-     */
-    @PostMapping("/remove")
-    @ResponseBody
-    @RequiresPermissions("data:dataUpload:remove")
-    public R remove(Long id) {
-        if (dataUploadService.remove(id) > 0) {
-            return R.ok();
-        }
-        return R.error();
-    }
-
-    /**
-     * 删除
-     */
-    @PostMapping("/batchRemove")
-    @ResponseBody
-    @RequiresPermissions("data:dataUpload:batchRemove")
-    public R remove(@RequestParam("ids[]") Long[] ids) {
-        dataUploadService.batchRemove(ids);
-        return R.ok();
-    }
-
-}

src/main/java/com/bootdo/data/controller/TfInfoEnterpriseController.java

@@ -1,93 +0,0 @@
-package com.bootdo.data.controller;
-
-import com.bootdo.common.annotation.Log;
-import com.bootdo.common.utils.EhcacheUtil;
-import com.bootdo.common.utils.PageUtils;
-import com.bootdo.common.utils.Query;
-import com.bootdo.common.utils.R;
-import com.bootdo.data.domain.DataInfoDO;
-import com.bootdo.data.entity.TfInfoEnterprise;
-import com.bootdo.data.service.TfInfoEnterpriseService;
-import com.bootdo.datas.domain.DataDO;
-import com.bootdo.portal.common.CommonConstants;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.UUID;
-
-/**
- * 企业(TfInfoEnterprise)表控制层
- *
- * @author Mr.xiBel
- * @since 2022-05-09 15:51:40
- */
-@Controller
-@RequestMapping("/data/enterpriseInfo")
-public class TfInfoEnterpriseController {
-    /**
-     * 服务对象
-     */
-    @Resource
-    private TfInfoEnterpriseService tfInfoEnterpriseService;
-
-    @Log("访问企业信息")
-    @GetMapping()
-    @RequiresPermissions("enterprise:info:list")
-    String dataInfo() {
-        return "data/enterpriseInfo/dataInfo";
-    }
-
-    /**
-     * 分页获取数据
-     *
-     * @param params
-     * @return
-     */
-    @ResponseBody
-    @GetMapping("/list")
-    @RequiresPermissions("enterprise:info:list")
-    public PageUtils list(@RequestParam Map<String, Object> params) {
-        // 查询列表数据
-        Query query = new Query(params);
-        List<TfInfoEnterprise> dataInfoList = tfInfoEnterpriseService.queryPage(query);
-        int total = tfInfoEnterpriseService.queryPageCount(query);
-        return new PageUtils(dataInfoList, total);
-    }
-
-
-    @PostMapping("/disabled")
-    @RequiresPermissions("enterprise:info:disabled")
-    @ResponseBody
-    public R disable(Long id) {
-        tfInfoEnterpriseService.disable(id);
-        return R.ok();
-    }
-
-
-    /**
-     * 通过主键查询单条数据
-     *
-     * @param id 主键
-     * @return 单条数据
-     */
-    @GetMapping("/edit")
-    @RequiresPermissions("enterprise:info:update")
-    public TfInfoEnterprise selectOne(Integer id) {
-        return this.tfInfoEnterpriseService.queryById(id);
-    }
-
-
-    @GetMapping("/edit/{id}")
-    @RequiresPermissions("enterprise:info:update")
-    String edit(@PathVariable("id") Integer id, Model model) {
-        TfInfoEnterprise data = this.tfInfoEnterpriseService.queryById(id);
-        model.addAttribute("data", data);
-        return "data/enterpriseInfo/edit";
-    }
-}

src/main/java/com/bootdo/data/controller/UnitInfoController.java

@@ -1,275 +0,0 @@
-package com.bootdo.data.controller;
-
-import com.bootdo.common.annotation.Log;
-import com.bootdo.common.utils.PageUtils;
-import com.bootdo.common.utils.Query;
-import com.bootdo.common.utils.R;
-import com.bootdo.common.utils.ShiroUtils;
-import com.bootdo.data.domain.UnitApplyInfoDO;
-import com.bootdo.data.domain.UnitInfoDO;
-import com.bootdo.data.service.UnitInfoService;
-import com.bootdo.system.domain.UserDO;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 数据处理者名称表
- * 
- * @author admin
- * @email admin@163.com
- * @date 2022-02-28 17:08:50
- */
-
-@Controller
-@RequestMapping("/data/unitInfo")
-public class UnitInfoController {
-
-    private static Logger log = LoggerFactory.getLogger(UnitInfoController.class);
-
-    @Autowired
-    private UnitInfoService unitInfoService;
-
-    @Log("访问备案上报")
-    @GetMapping()
-    @RequiresPermissions("data:unitInfo:unitInfo")
-    String UnitInfo(Model model) {
-        // UserDO currUser = ShiroUtils.getUser();
-        //// 查询列表数据
-        // Map<String, Object> map = new HashMap<>(16);
-        // map.put("uploadUserid", currUser.getUserId());
-        // List<UnitInfoDO> list = unitInfoService.list(map);
-        // UnitInfoDO unitInfo = new UnitInfoDO();
-        // if (list != null && list.size() > 0) {
-        // // 已维护过
-        // unitInfo = list.get(0);
-        // // model.addAttribute("unitInfo", unitInfo);
-        // // return "data/unitInfo/edit";
-        // }
-        // model.addAttribute("unitInfo", unitInfo);
-        return "data/unitInfo/unitInfo";
-    }
-
-    /**
-     * @Description: 申请备案
-     * @Author: wangp
-     * @Date: 2022/3/1 12:32
-     * @param model
-     * @Return: String
-     */
-    @GetMapping("/ask/{param}")
-    @RequiresPermissions("data:unitInfo:unitInfo")
-    String ask(@PathVariable("param") String param, Model model) {
-        log.info("param:" + param);
-        UserDO currUser = ShiroUtils.getUser();
-        // 查询列表数据
-        Map<String, Object> map = new HashMap<>(16);
-        map.put("uploadUserid", currUser.getUserId());
-        List<UnitInfoDO> list = unitInfoService.list(map);
-        UnitInfoDO unitInfo = new UnitInfoDO();
-        if (list != null && list.size() > 0) {
-            // 已维护过
-            unitInfo = list.get(0);
-            // model.addAttribute("unitInfo", unitInfo);
-            // return "data/unitInfo/edit";
-        }
-        model.addAttribute("unitInfo", unitInfo);
-        log.info("param:" + param);
-        model.addAttribute("paramInfo", param);
-        //model.addAttribute("pName", "根数据");
-        return "data/unitInfo/askInfo";
-    }
-
-
-    @GetMapping("/askEdit/{param}")
-    @RequiresPermissions("data:unitInfo:unitInfo")
-    String askEdit(@PathVariable("param") String param, Model model) {
-        log.info("param:" + param);
-        UserDO currUser = ShiroUtils.getUser();
-        // 查询列表数据
-        Map<String, Object> map = new HashMap<>(16);
-        map.put("uploadUserid", currUser.getUserId());
-        map.put("id", param);
-        List<UnitApplyInfoDO> list = unitInfoService.listEditInfo(map);
-        UnitApplyInfoDO unitInfo = new UnitApplyInfoDO();
-        if (list != null && list.size() > 0) {
-            // 已维护过
-            unitInfo = list.get(0);
-            // model.addAttribute("unitInfo", unitInfo);
-            // return "data/unitInfo/edit";
-        }
-        model.addAttribute("unitInfo", unitInfo);
-        log.info("param:" + param);
-        model.addAttribute("paramInfo", param);
-        model.addAttribute("pName", "根数据");
-        return "data/unitInfo/askEditInfo";
-    }
-
-    @ResponseBody
-    @GetMapping("/list")
-    @RequiresPermissions("data:unitInfo:unitInfo")
-    public PageUtils list(@RequestParam Map<String, Object> params) {
-        // 查询列表数据
-        Query query = new Query(params);
-        // List<UnitInfoDO> unitInfoList = unitInfoService.list(query);
-        List<UnitApplyInfoDO> unitInfoList = unitInfoService.listQuery(query);
-        int total = unitInfoService.countQuery(query);
-        PageUtils pageUtils = new PageUtils(unitInfoList, total);
-        return pageUtils;
-    }
-
-    /**
-     * @Description: 单位信息维护
-     * @Author: wangp
-     * @Date: 2022/2/28 17:26
-     * @param
-     * @Return: String
-     */
-    @GetMapping("/unitInfo")
-    @RequiresPermissions("data:unitInfo:add")
-    String Info(Model model) {
-        UserDO currUser = ShiroUtils.getUser();
-        String flag = "false";
-        // 查询列表数据
-        Map<String, Object> map = new HashMap<>(16);
-        map.put("uploadUserid", currUser.getUserId());
-        List<UnitInfoDO> list = unitInfoService.list(map);
-        UnitInfoDO unitInfo = new UnitInfoDO();
-        if (list != null && list.size() > 0) {
-            // 已维护过
-            unitInfo = list.get(0);
-            flag = "true";
-            // model.addAttribute("unitInfo", unitInfo);
-            // return "data/unitInfo/edit";
-        }
-        model.addAttribute("unitInfo", unitInfo);
-        model.addAttribute("flag", flag);
-        return "data/unitInfo/edit";
-    }
-
-    /**
-     * @Description:
-     * @Author: wangp
-     * @Date: 2022/3/1 0:29
-     * @param
-     * @Return: String
-     */
-    @GetMapping("/queryDataInfo")
-    @RequiresPermissions("data:unitInfo:add")
-    String queryDataInfo() {
-        return "data/unitInfo/queryDataInfo";
-    }
-
-    /**
-     * @Description: 备案申请
-     * @Author: wangp
-     * @Date: 2022/2/28 17:27
-     * @param
-     * @Return: String
-     */
-    @GetMapping("/add")
-    @RequiresPermissions("data:unitInfo:add")
-    String add() {
-        return "data/unitInfo/add";
-    }
-
-    @GetMapping("/edit/{id}")
-    @RequiresPermissions("data:unitInfo:edit")
-    String edit(@PathVariable("id") Long id, Model model) {
-        UnitInfoDO unitInfo = unitInfoService.get(id);
-        model.addAttribute("unitInfo", unitInfo);
-        return "data/unitInfo/edit";
-    }
-
-    /**
-     * 保存
-     */
-    @ResponseBody
-    @PostMapping("/save")
-    @RequiresPermissions("data:unitInfo:add")
-    public R save(UnitInfoDO unitInfo) {
-
-        UserDO currUser = ShiroUtils.getUser();
-        log.info("currUser:" + currUser.toString());
-        if (null == currUser) {
-            unitInfo.setUploadUserid("-1");
-            unitInfo.setUploadUser("获取用户信息为空");
-        } else {
-            unitInfo.setUploadUserid(String.valueOf(ShiroUtils.getUserId()));
-            unitInfo.setUploadUser(ShiroUtils.getUser().getUsername());
-        }
-        unitInfo.setStatus("0");// 状态
-        if (unitInfoService.save(unitInfo) > 0) {
-            return R.ok();
-        }
-        return R.error();
-    }
-
-    /**
-     * 修改
-     */
-    @ResponseBody
-    @RequestMapping("/update")
-    @RequiresPermissions("data:unitInfo:edit")
-    public R update(UnitInfoDO unitInfo) {
-        unitInfoService.update(unitInfo);
-        return R.ok();
-    }
-
-    /**
-     * 删除
-     */
-    @PostMapping("/askRemove")
-    @ResponseBody
-    @RequiresPermissions("data:unitInfo:remove")
-    public R askRemove(Long id) {
-        if (unitInfoService.askRemove(id) > 0) {
-            return R.ok();
-        }
-        return R.error();
-    }
-
-    /**
-     * 删除
-     */
-    @PostMapping("/askBatchRemove")
-    @ResponseBody
-    @RequiresPermissions("data:unitInfo:batchRemove")
-    public R askBatchRemove(@RequestParam("ids[]") Long[] ids) {
-        unitInfoService.askBatchRemove(ids);
-        return R.ok();
-    }
-
-    /**
-     * 删除
-     */
-    @PostMapping("/remove")
-    @ResponseBody
-    @RequiresPermissions("data:unitInfo:remove")
-    public R remove(Long id) {
-        if (unitInfoService.remove(id) > 0) {
-            return R.ok();
-        }
-        return R.error();
-    }
-
-    /**
-     * 删除
-     */
-    @PostMapping("/batchRemove")
-    @ResponseBody
-    @RequiresPermissions("data:unitInfo:batchRemove")
-    public R remove(@RequestParam("ids[]") Long[] ids) {
-        unitInfoService.batchRemove(ids);
-        return R.ok();
-    }
-
-}

src/main/java/com/bootdo/data/dao/CaDetailMapper.java

@@ -1,70 +0,0 @@
-package com.bootdo.data.dao;
-
-import com.bootdo.data.domain.CaDetail;
-import com.bootdo.data.domain.CaDetailExample;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-@Mapper
-public interface CaDetailMapper {
-    long countByExample(CaDetailExample example);
-
-    int deleteByExample(CaDetailExample example);
-
-    /**
-     * delete by primary key
-     *
-     * @param id primaryKey
-     * @return deleteCount
-     */
-    int deleteByPrimaryKey(Integer id);
-
-    /**
-     * insert record to table
-     *
-     * @param record the record
-     * @return insert count
-     */
-    int insert(CaDetail record);
-
-    /**
-     * insert record to table selective
-     *
-     * @param record the record
-     * @return insert count
-     */
-    int insertSelective(CaDetail record);
-
-    List<CaDetail> selectByExample(CaDetailExample example);
-
-    /**
-     * select by primary key
-     *
-     * @param id primary key
-     * @return object by primary key
-     */
-    CaDetail selectByPrimaryKey(Integer id);
-
-    int updateByExampleSelective(@Param("record") CaDetail record, @Param("example") CaDetailExample example);
-
-    int updateByExample(@Param("record") CaDetail record, @Param("example") CaDetailExample example);
-
-    /**
-     * update record selective
-     *
-     * @param record the updated record
-     * @return update count
-     */
-    int updateByPrimaryKeySelective(CaDetail record);
-
-    /**
-     * update record
-     *
-     * @param record the updated record
-     * @return update count
-     */
-    int updateByPrimaryKey(CaDetail record);
-}

src/main/java/com/bootdo/data/dao/CaInfoMapper.java

@@ -1,97 +0,0 @@
-package com.bootdo.data.dao;
-
-import com.bootdo.common.utils.Query;
-import com.bootdo.data.domain.CaInfo;
-import com.bootdo.data.domain.CaInfoExample;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-@Mapper
-public interface CaInfoMapper {
-    long countByExample(CaInfoExample example);
-
-    int deleteByExample(CaInfoExample example);
-
-    /**
-     * delete by primary key
-     *
-     * @param id primaryKey
-     * @return deleteCount
-     */
-    int deleteByPrimaryKey(Integer id);
-
-    /**
-     * insert record to table
-     *
-     * @param record the record
-     * @return insert count
-     */
-    int insert(CaInfo record);
-
-    /**
-     * insert record to table selective
-     *
-     * @param record the record
-     * @return insert count
-     */
-    int insertSelective(CaInfo record);
-
-    List<CaInfo> selectByExample(CaInfoExample example);
-
-    /**
-     * select by primary key
-     *
-     * @param id primary key
-     * @return object by primary key
-     */
-    CaInfo selectByPrimaryKey(Integer id);
-
-    int updateByExampleSelective(@Param("record") CaInfo record, @Param("example") CaInfoExample example);
-
-    int updateByExample(@Param("record") CaInfo record, @Param("example") CaInfoExample example);
-
-    /**
-     * update record selective
-     *
-     * @param record the updated record
-     * @return update count
-     */
-    int updateByPrimaryKeySelective(CaInfo record);
-
-    /**
-     * update record
-     *
-     * @param record the updated record
-     * @return update count
-     */
-    int updateByPrimaryKey(CaInfo record);
-
-    /**
-     * 分页条件查询 证书列表数据
-     *
-     * @param query
-     * @return
-     */
-    List<CaInfo> queryPage(Query query);
-
-    /**
-     * 分页条件查询 证书列表数据 条数
-     *
-     * @param query
-     * @return
-     */
-    int queryPageCount(Query query);
-
-    /**
-     * 根据公司名称和 统一社会信用代码 获取最新的 企业ca
-     *
-     * @param companyName
-     * @param uniformSocialCreditCode
-     * @return
-     */
-    CaInfo getByCompanyNameAndUniformSocialCreditCode(@Param("companyName") String companyName,
-                                                      @Param("uniformSocialCreditCode") String uniformSocialCreditCode);
-}

src/main/java/com/bootdo/data/dao/DataApplyDao.java

@@ -1,32 +0,0 @@
-package com.bootdo.data.dao;
-
-import com.bootdo.data.domain.DataApplyDO;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 数据备案表
- * @author admin
- * @email admin@163.com
- * @date 2022-03-01 14:23:15
- */
-@Mapper
-public interface DataApplyDao {
-
-	DataApplyDO get(Long id);
-	
-	List<DataApplyDO> list(Map<String,Object> map);
-	
-	int count(Map<String,Object> map);
-	
-	int save(DataApplyDO dataApply);
-	
-	int update(DataApplyDO dataApply);
-	
-	int remove(Long ID);
-	
-	int batchRemove(Long[] ids);
-}

src/main/java/com/bootdo/data/dao/DataApprovalDao.java

@@ -1,35 +0,0 @@
-package com.bootdo.data.dao;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.bootdo.data.domain.DataApprovalDO;
-import com.bootdo.data.domain.UnitApplyInfoDO;
-
-/**
- * 
- * @author admin
- * @email admin@163.com
- * @date 2022-03-01 17:56:11
- */
-@Mapper
-public interface DataApprovalDao {
-
-	DataApprovalDO get(Long id);
-	
-	List<UnitApplyInfoDO> list(Map<String,Object> map);
-	
-	int count(Map<String,Object> map);
-	
-	int save(DataApprovalDO dataApproval);
-	
-	int update(DataApprovalDO dataApproval);
-	
-	int remove(Long ID);
-	
-	int batchRemove(Long[] ids);
-
-    void removeByApplyId(long applyId);
-}

src/main/java/com/bootdo/data/dao/DataInfoDao.java

@@ -1,43 +0,0 @@
-package com.bootdo.data.dao;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.bootdo.data.domain.DataInfoDO;
-
-/**
- * 重要数据表
- * @author admin
- * @email admin@163.com
- * @date 2022-02-27 17:27:36
- */
-@Mapper
-public interface DataInfoDao {
-
-	DataInfoDO get(Long id);
-	
-	List<DataInfoDO> list(Map<String,Object> map);
-	
-	int count(Map<String,Object> map);
-	
-	int save(DataInfoDO dataInfo);
-	
-	int update(DataInfoDO dataInfo);
-	
-	int remove(Long ID);
-	
-	int batchRemove(Long[] ids);
-
-	/**
-	 * @Description:重要数据和核心数据目录备案清单 初始化
-	 * @Author: wangp
-	 * @Date: 2022/3/1 19:05
-	 * @param params
-	 * @Return: List<DataInfoDO>
-	 */
-    List<DataInfoDO> querylistInfo(Map<String, Object> params);
-
-	int updateRelation(Long applyId);
-}

src/main/java/com/bootdo/data/dao/DataPartDao.java

@@ -1,32 +0,0 @@
-package com.bootdo.data.dao;
-
-import com.bootdo.data.domain.DataPartDO;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 分类分级
- * @author admin
- * @email admin@163.com
- * @date 2022-02-27 23:33:17
- */
-@Mapper
-public interface DataPartDao {
-
-	DataPartDO get(Long partId);
-	
-	List<DataPartDO> list(Map<String,Object> map);
-	
-	int count(Map<String,Object> map);
-	
-	int save(DataPartDO dataPart);
-	
-	int update(DataPartDO dataPart);
-	
-	int remove(Long PART_ID);
-	
-	int batchRemove(Long[] partIds);
-}

src/main/java/com/bootdo/data/dao/DataRelationDao.java

@@ -1,40 +0,0 @@
-package com.bootdo.data.dao;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.bootdo.data.domain.DataRelationDO;
-
-/**
- * 数据备案与重要数据关系表
- * @author admin
- * @email admin@163.com
- * @date 2022-03-01 14:26:26
- */
-@Mapper
-public interface DataRelationDao {
-
-	DataRelationDO get(Long id);
-	
-	List<DataRelationDO> list(Map<String,Object> map);
-	
-	int count(Map<String,Object> map);
-	
-	int save(DataRelationDO dataRelation);
-	
-	int update(DataRelationDO dataRelation);
-	
-	int remove(Long id);
-
-	int removeByApplyId(Long applyId);
-	int batchRemoveByApplyId(Long[] ids);
-
-	int removeByDataId(Long dataId);
-	int batchRemoveByDataId(Long[] ids);
-	
-	int batchRemove(Long[] ids);
-
-	void batchSave(List<DataRelationDO> list);
-}

src/main/java/com/bootdo/data/dao/DataUploadDao.java

@@ -1,31 +0,0 @@
-package com.bootdo.data.dao;
-
-
-import java.util.List;
-import java.util.Map;
-
-import com.bootdo.data.domain.DataUploadDO;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @Description: 重要数据
- * @Author: wangp
- * @Date: 2022/2/27 14:49
- */
-@Mapper
-public interface DataUploadDao {
-
-	DataUploadDO get(Long id);
-	
-	List<DataUploadDO> list(Map<String,Object> map);
-	
-	int count(Map<String,Object> map);
-	
-	int save(DataUploadDO dataUpload);
-	
-	int update(DataUploadDO dataUpload);
-	
-	int remove(Long ID);
-	
-	int batchRemove(Long[] ids);
-}

src/main/java/com/bootdo/data/dao/TfInfoEnterpriseDao.java

@@ -1,90 +0,0 @@
-package com.bootdo.data.dao;
-
-import com.bootdo.data.entity.TfInfoEnterprise;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 法人表(TfInfoEnterprise)表数据库访问层
- *
- * @author makejava
- * @since 2022-05-09 15:51:40
- */
-public interface TfInfoEnterpriseDao {
-
-    /**
-     * 通过ID查询单条数据
-     *
-     * @param id 主键
-     * @return 实例对象
-     */
-    TfInfoEnterprise queryById(Integer id);
-
-    /**
-     * 查询指定行数据
-     *
-     * @param offset 查询起始位置
-     * @param limit  查询条数
-     * @return 对象列表
-     */
-    List<TfInfoEnterprise> queryAllByLimit(@Param("offset") int offset, @Param("limit") int limit);
-
-
-    /**
-     * 通过实体作为筛选条件查询
-     *
-     * @param tfInfoEnterprise 实例对象
-     * @return 对象列表
-     */
-    List<TfInfoEnterprise> queryAll(TfInfoEnterprise tfInfoEnterprise);
-
-    /**
-     * 分页查询
-     *
-     * @param map
-     * @return
-     */
-    List<TfInfoEnterprise> queryPage(Map<String, Object> map);
-
-    /**
-     * count
-     *
-     * @param map
-     * @return
-     */
-    int queryPageCount(Map<String, Object> map);
-
-    /**
-     * 新增数据
-     *
-     * @param tfInfoEnterprise 实例对象
-     * @return 影响行数
-     */
-    int insert(TfInfoEnterprise tfInfoEnterprise);
-
-    /**
-     * 修改数据
-     *
-     * @param tfInfoEnterprise 实例对象
-     * @return 影响行数
-     */
-    int update(TfInfoEnterprise tfInfoEnterprise);
-
-    /**
-     * 通过主键删除数据
-     *
-     * @param id 主键
-     * @return 影响行数
-     */
-    int deleteById(Integer id);
-
-    /**
-     * 登陆查询
-     *
-     * @param parameter
-     * @return
-     */
-    TfInfoEnterprise loginQuery(Map<String, Object> parameter);
-}

src/main/java/com/bootdo/data/dao/UnitInfoDao.java

@@ -1,39 +0,0 @@
-package com.bootdo.data.dao;
-
-import com.bootdo.data.domain.UnitApplyInfoDO;
-import com.bootdo.data.domain.UnitInfoDO;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 数据处理者名称表
- * @author admin
- * @email admin@163.com
- * @date 2022-02-28 17:08:50
- */
-@Mapper
-public interface UnitInfoDao {
-
-	UnitInfoDO get(Long id);
-	
-	List<UnitInfoDO> list(Map<String,Object> map);
-	
-	int count(Map<String,Object> map);
-	
-	int save(UnitInfoDO unitInfo);
-	
-	int update(UnitInfoDO unitInfo);
-	
-	int remove(Long ID);
-	
-	int batchRemove(Long[] ids);
-
-    List<UnitApplyInfoDO> listQuery(Map<String, Object> map);
-
-	int countQuery(Map<String, Object> map);
-
-    List<UnitApplyInfoDO> listEditInfo(Map<String, Object> map);
-}

src/main/java/com/bootdo/data/domain/CaDetail.java

@@ -1,167 +0,0 @@
-package com.bootdo.data.domain;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * ca证书产生详情
- */
-public class CaDetail implements Serializable {
-    private Integer id;
-
-    /**
-     * 密钥对 私钥密钥
-     */
-    private String keyPairPrivate;
-
-    /**
-     * 密钥对 公钥密钥
-     */
-    private String keyPairPublic;
-
-    /**
-     * 证书生成时 请求内容报文
-     */
-    private String requestContent;
-
-    /**
-     * 证书生成时 请求响应内容报文
-     */
-    private String responseContent;
-
-    /**
-     * 创建时间
-     */
-    private Date crateTime;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    private static final long serialVersionUID = 1L;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getKeyPairPrivate() {
-        return keyPairPrivate;
-    }
-
-    public void setKeyPairPrivate(String keyPairPrivate) {
-        this.keyPairPrivate = keyPairPrivate;
-    }
-
-    public String getKeyPairPublic() {
-        return keyPairPublic;
-    }
-
-    public void setKeyPairPublic(String keyPairPublic) {
-        this.keyPairPublic = keyPairPublic;
-    }
-
-    public String getRequestContent() {
-        return requestContent;
-    }
-
-    public void setRequestContent(String requestContent) {
-        this.requestContent = requestContent;
-    }
-
-    public String getResponseContent() {
-        return responseContent;
-    }
-
-    public void setResponseContent(String responseContent) {
-        this.responseContent = responseContent;
-    }
-
-    public Date getCrateTime() {
-        return crateTime;
-    }
-
-    public void setCrateTime(Date crateTime) {
-        this.crateTime = crateTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", keyPairPrivate=").append(keyPairPrivate);
-        sb.append(", keyPairPublic=").append(keyPairPublic);
-        sb.append(", requestContent=").append(requestContent);
-        sb.append(", responseContent=").append(responseContent);
-        sb.append(", crateTime=").append(crateTime);
-        sb.append(", updateTime=").append(updateTime);
-        sb.append(", remark=").append(remark);
-        sb.append("]");
-        return sb.toString();
-    }
-
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        CaDetail other = (CaDetail) that;
-        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-                && (this.getKeyPairPrivate() == null ? other.getKeyPairPrivate() == null : this.getKeyPairPrivate().equals(other.getKeyPairPrivate()))
-                && (this.getKeyPairPublic() == null ? other.getKeyPairPublic() == null : this.getKeyPairPublic().equals(other.getKeyPairPublic()))
-                && (this.getRequestContent() == null ? other.getRequestContent() == null : this.getRequestContent().equals(other.getRequestContent()))
-                && (this.getResponseContent() == null ? other.getResponseContent() == null : this.getResponseContent().equals(other.getResponseContent()))
-                && (this.getCrateTime() == null ? other.getCrateTime() == null : this.getCrateTime().equals(other.getCrateTime()))
-                && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
-                && (this.getRemark() == null ? other.getRemark() == null : this.getRemark().equals(other.getRemark()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getKeyPairPrivate() == null) ? 0 : getKeyPairPrivate().hashCode());
-        result = prime * result + ((getKeyPairPublic() == null) ? 0 : getKeyPairPublic().hashCode());
-        result = prime * result + ((getRequestContent() == null) ? 0 : getRequestContent().hashCode());
-        result = prime * result + ((getResponseContent() == null) ? 0 : getResponseContent().hashCode());
-        result = prime * result + ((getCrateTime() == null) ? 0 : getCrateTime().hashCode());
-        result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
-        result = prime * result + ((getRemark() == null) ? 0 : getRemark().hashCode());
-        return result;
-    }
-}

src/main/java/com/bootdo/data/domain/CaDetailExample.java

@@ -1,731 +0,0 @@
-package com.bootdo.data.domain;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class CaDetailExample {
-    protected String orderByClause;
-
-    protected boolean distinct;
-
-    protected List<Criteria> oredCriteria;
-
-    public CaDetailExample() {
-        oredCriteria = new ArrayList<>();
-    }
-
-    public void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
-    public void or(Criteria criteria) {
-        oredCriteria.add(criteria);
-    }
-
-    public Criteria or() {
-        Criteria criteria = createCriteriaInternal();
-        oredCriteria.add(criteria);
-        return criteria;
-    }
-
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
-    }
-
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria();
-        return criteria;
-    }
-
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
-    }
-
-    protected abstract static class GeneratedCriteria {
-        protected List<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> getCriteria() {
-            return criteria;
-        }
-
-        protected void addCriterion(String condition) {
-            if (condition == null) {
-                throw new RuntimeException("Value for condition cannot be null");
-            }
-            criteria.add(new Criterion(condition));
-        }
-
-        protected void addCriterion(String condition, Object value, String property) {
-            if (value == null) {
-                throw new RuntimeException("Value for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value));
-        }
-
-        protected void addCriterion(String condition, Object value1, Object value2, String property) {
-            if (value1 == null || value2 == null) {
-                throw new RuntimeException("Between values for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value1, value2));
-        }
-
-        public Criteria andIdIsNull() {
-            addCriterion("id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIsNotNull() {
-            addCriterion("id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdEqualTo(Integer value) {
-            addCriterion("id =", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotEqualTo(Integer value) {
-            addCriterion("id <>", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThan(Integer value) {
-            addCriterion("id >", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("id >=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThan(Integer value) {
-            addCriterion("id <", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThanOrEqualTo(Integer value) {
-            addCriterion("id <=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIn(List<Integer> values) {
-            addCriterion("id in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotIn(List<Integer> values) {
-            addCriterion("id not in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdBetween(Integer value1, Integer value2) {
-            addCriterion("id between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("id not between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPrivateIsNull() {
-            addCriterion("key_pair_private is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPrivateIsNotNull() {
-            addCriterion("key_pair_private is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPrivateEqualTo(String value) {
-            addCriterion("key_pair_private =", value, "keyPairPrivate");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPrivateNotEqualTo(String value) {
-            addCriterion("key_pair_private <>", value, "keyPairPrivate");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPrivateGreaterThan(String value) {
-            addCriterion("key_pair_private >", value, "keyPairPrivate");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPrivateGreaterThanOrEqualTo(String value) {
-            addCriterion("key_pair_private >=", value, "keyPairPrivate");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPrivateLessThan(String value) {
-            addCriterion("key_pair_private <", value, "keyPairPrivate");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPrivateLessThanOrEqualTo(String value) {
-            addCriterion("key_pair_private <=", value, "keyPairPrivate");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPrivateLike(String value) {
-            addCriterion("key_pair_private like", value, "keyPairPrivate");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPrivateNotLike(String value) {
-            addCriterion("key_pair_private not like", value, "keyPairPrivate");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPrivateIn(List<String> values) {
-            addCriterion("key_pair_private in", values, "keyPairPrivate");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPrivateNotIn(List<String> values) {
-            addCriterion("key_pair_private not in", values, "keyPairPrivate");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPrivateBetween(String value1, String value2) {
-            addCriterion("key_pair_private between", value1, value2, "keyPairPrivate");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPrivateNotBetween(String value1, String value2) {
-            addCriterion("key_pair_private not between", value1, value2, "keyPairPrivate");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPublicIsNull() {
-            addCriterion("key_pair_public is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPublicIsNotNull() {
-            addCriterion("key_pair_public is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPublicEqualTo(String value) {
-            addCriterion("key_pair_public =", value, "keyPairPublic");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPublicNotEqualTo(String value) {
-            addCriterion("key_pair_public <>", value, "keyPairPublic");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPublicGreaterThan(String value) {
-            addCriterion("key_pair_public >", value, "keyPairPublic");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPublicGreaterThanOrEqualTo(String value) {
-            addCriterion("key_pair_public >=", value, "keyPairPublic");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPublicLessThan(String value) {
-            addCriterion("key_pair_public <", value, "keyPairPublic");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPublicLessThanOrEqualTo(String value) {
-            addCriterion("key_pair_public <=", value, "keyPairPublic");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPublicLike(String value) {
-            addCriterion("key_pair_public like", value, "keyPairPublic");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPublicNotLike(String value) {
-            addCriterion("key_pair_public not like", value, "keyPairPublic");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPublicIn(List<String> values) {
-            addCriterion("key_pair_public in", values, "keyPairPublic");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPublicNotIn(List<String> values) {
-            addCriterion("key_pair_public not in", values, "keyPairPublic");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPublicBetween(String value1, String value2) {
-            addCriterion("key_pair_public between", value1, value2, "keyPairPublic");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeyPairPublicNotBetween(String value1, String value2) {
-            addCriterion("key_pair_public not between", value1, value2, "keyPairPublic");
-            return (Criteria) this;
-        }
-
-        public Criteria andRequestContentIsNull() {
-            addCriterion("request_content is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRequestContentIsNotNull() {
-            addCriterion("request_content is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRequestContentEqualTo(String value) {
-            addCriterion("request_content =", value, "requestContent");
-            return (Criteria) this;
-        }
-
-        public Criteria andRequestContentNotEqualTo(String value) {
-            addCriterion("request_content <>", value, "requestContent");
-            return (Criteria) this;
-        }
-
-        public Criteria andRequestContentGreaterThan(String value) {
-            addCriterion("request_content >", value, "requestContent");
-            return (Criteria) this;
-        }
-
-        public Criteria andRequestContentGreaterThanOrEqualTo(String value) {
-            addCriterion("request_content >=", value, "requestContent");
-            return (Criteria) this;
-        }
-
-        public Criteria andRequestContentLessThan(String value) {
-            addCriterion("request_content <", value, "requestContent");
-            return (Criteria) this;
-        }
-
-        public Criteria andRequestContentLessThanOrEqualTo(String value) {
-            addCriterion("request_content <=", value, "requestContent");
-            return (Criteria) this;
-        }
-
-        public Criteria andRequestContentLike(String value) {
-            addCriterion("request_content like", value, "requestContent");
-            return (Criteria) this;
-        }
-
-        public Criteria andRequestContentNotLike(String value) {
-            addCriterion("request_content not like", value, "requestContent");
-            return (Criteria) this;
-        }
-
-        public Criteria andRequestContentIn(List<String> values) {
-            addCriterion("request_content in", values, "requestContent");
-            return (Criteria) this;
-        }
-
-        public Criteria andRequestContentNotIn(List<String> values) {
-            addCriterion("request_content not in", values, "requestContent");
-            return (Criteria) this;
-        }
-
-        public Criteria andRequestContentBetween(String value1, String value2) {
-            addCriterion("request_content between", value1, value2, "requestContent");
-            return (Criteria) this;
-        }
-
-        public Criteria andRequestContentNotBetween(String value1, String value2) {
-            addCriterion("request_content not between", value1, value2, "requestContent");
-            return (Criteria) this;
-        }
-
-        public Criteria andResponseContentIsNull() {
-            addCriterion("response_content is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andResponseContentIsNotNull() {
-            addCriterion("response_content is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andResponseContentEqualTo(String value) {
-            addCriterion("response_content =", value, "responseContent");
-            return (Criteria) this;
-        }
-
-        public Criteria andResponseContentNotEqualTo(String value) {
-            addCriterion("response_content <>", value, "responseContent");
-            return (Criteria) this;
-        }
-
-        public Criteria andResponseContentGreaterThan(String value) {
-            addCriterion("response_content >", value, "responseContent");
-            return (Criteria) this;
-        }
-
-        public Criteria andResponseContentGreaterThanOrEqualTo(String value) {
-            addCriterion("response_content >=", value, "responseContent");
-            return (Criteria) this;
-        }
-
-        public Criteria andResponseContentLessThan(String value) {
-            addCriterion("response_content <", value, "responseContent");
-            return (Criteria) this;
-        }
-
-        public Criteria andResponseContentLessThanOrEqualTo(String value) {
-            addCriterion("response_content <=", value, "responseContent");
-            return (Criteria) this;
-        }
-
-        public Criteria andResponseContentLike(String value) {
-            addCriterion("response_content like", value, "responseContent");
-            return (Criteria) this;
-        }
-
-        public Criteria andResponseContentNotLike(String value) {
-            addCriterion("response_content not like", value, "responseContent");
-            return (Criteria) this;
-        }
-
-        public Criteria andResponseContentIn(List<String> values) {
-            addCriterion("response_content in", values, "responseContent");
-            return (Criteria) this;
-        }
-
-        public Criteria andResponseContentNotIn(List<String> values) {
-            addCriterion("response_content not in", values, "responseContent");
-            return (Criteria) this;
-        }
-
-        public Criteria andResponseContentBetween(String value1, String value2) {
-            addCriterion("response_content between", value1, value2, "responseContent");
-            return (Criteria) this;
-        }
-
-        public Criteria andResponseContentNotBetween(String value1, String value2) {
-            addCriterion("response_content not between", value1, value2, "responseContent");
-            return (Criteria) this;
-        }
-
-        public Criteria andCrateTimeIsNull() {
-            addCriterion("crate_time is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCrateTimeIsNotNull() {
-            addCriterion("crate_time is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCrateTimeEqualTo(Date value) {
-            addCriterion("crate_time =", value, "crateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCrateTimeNotEqualTo(Date value) {
-            addCriterion("crate_time <>", value, "crateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCrateTimeGreaterThan(Date value) {
-            addCriterion("crate_time >", value, "crateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCrateTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("crate_time >=", value, "crateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCrateTimeLessThan(Date value) {
-            addCriterion("crate_time <", value, "crateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCrateTimeLessThanOrEqualTo(Date value) {
-            addCriterion("crate_time <=", value, "crateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCrateTimeIn(List<Date> values) {
-            addCriterion("crate_time in", values, "crateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCrateTimeNotIn(List<Date> values) {
-            addCriterion("crate_time not in", values, "crateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCrateTimeBetween(Date value1, Date value2) {
-            addCriterion("crate_time between", value1, value2, "crateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCrateTimeNotBetween(Date value1, Date value2) {
-            addCriterion("crate_time not between", value1, value2, "crateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeIsNull() {
-            addCriterion("update_time is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeIsNotNull() {
-            addCriterion("update_time is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeEqualTo(Date value) {
-            addCriterion("update_time =", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotEqualTo(Date value) {
-            addCriterion("update_time <>", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeGreaterThan(Date value) {
-            addCriterion("update_time >", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("update_time >=", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeLessThan(Date value) {
-            addCriterion("update_time <", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
-            addCriterion("update_time <=", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeIn(List<Date> values) {
-            addCriterion("update_time in", values, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotIn(List<Date> values) {
-            addCriterion("update_time not in", values, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
-            addCriterion("update_time between", value1, value2, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
-            addCriterion("update_time not between", value1, value2, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkIsNull() {
-            addCriterion("remark is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkIsNotNull() {
-            addCriterion("remark is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkEqualTo(String value) {
-            addCriterion("remark =", value, "remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkNotEqualTo(String value) {
-            addCriterion("remark <>", value, "remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkGreaterThan(String value) {
-            addCriterion("remark >", value, "remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkGreaterThanOrEqualTo(String value) {
-            addCriterion("remark >=", value, "remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkLessThan(String value) {
-            addCriterion("remark <", value, "remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkLessThanOrEqualTo(String value) {
-            addCriterion("remark <=", value, "remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkLike(String value) {
-            addCriterion("remark like", value, "remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkNotLike(String value) {
-            addCriterion("remark not like", value, "remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkIn(List<String> values) {
-            addCriterion("remark in", values, "remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkNotIn(List<String> values) {
-            addCriterion("remark not in", values, "remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkBetween(String value1, String value2) {
-            addCriterion("remark between", value1, value2, "remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarkNotBetween(String value1, String value2) {
-            addCriterion("remark not between", value1, value2, "remark");
-            return (Criteria) this;
-        }
-    }
-
-    public static class Criteria extends GeneratedCriteria {
-
-        protected Criteria() {
-            super();
-        }
-    }
-
-    public static class Criterion {
-        private String condition;
-
-        private Object value;
-
-        private Object secondValue;
-
-        private boolean noValue;
-
-        private boolean singleValue;
-
-        private boolean betweenValue;
-
-        private boolean listValue;
-
-        private String typeHandler;
-
-        public String getCondition() {
-            return condition;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object getSecondValue() {
-            return secondValue;
-        }
-
-        public boolean isNoValue() {
-            return noValue;
-        }
-
-        public boolean isSingleValue() {
-            return singleValue;
-        }
-
-        public boolean isBetweenValue() {
-            return betweenValue;
-        }
-
-        public boolean isListValue() {
-            return listValue;
-        }
-
-        public String getTypeHandler() {
-            return typeHandler;
-        }
-
-        protected Criterion(String condition) {
-            super();
-            this.condition = condition;
-            this.typeHandler = null;
-            this.noValue = true;
-        }
-
-        protected Criterion(String condition, Object value, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.typeHandler = typeHandler;
-            if (value instanceof List<?>) {
-                this.listValue = true;
-            } else {
-                this.singleValue = true;
-            }
-        }
-
-        protected Criterion(String condition, Object value) {
-            this(condition, value, null);
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.secondValue = secondValue;
-            this.typeHandler = typeHandler;
-            this.betweenValue = true;
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue) {
-            this(condition, value, secondValue, null);
-        }
-    }
-}

src/main/java/com/bootdo/data/domain/CaInfo.java

@@ -1,303 +0,0 @@
-package com.bootdo.data.domain;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * ca证书企业信息表
- */
-public class CaInfo implements Serializable {
-
-    /**
-     * ca证书状态 0删除 1已申请 2通过 3拒绝
-     */
-    public static final int CA_STATUS_APPLY = 1;
-    public static final int CA_STATUS_PASS = 2;
-    public static final int CA_STATUS_REFUSE = 3;
-
-    private Integer id;
-
-    /**
-     * 统一社会信用代码
-     */
-    private String uniformSocialCreditCode;
-
-    /**
-     * 公司名称
-     */
-    private String companyName;
-
-    /**
-     * 企业税号
-     */
-    private String taxationNum;
-
-    /**
-     * 联系地址
-     */
-    private String connectAddress;
-
-    /**
-     * 联系人
-     */
-    private String connectName;
-
-    /**
-     * 联系电话
-     */
-    private String connectPhone;
-
-    /**
-     * 邮箱
-     */
-    private String connectEmail;
-
-    /**
-     * 证书有效起始时间
-     */
-    private Date effectiveTimeBeige;
-
-    /**
-     * 证书有效结束时间
-     */
-    private Date effectiveTimeEnd;
-
-    /**
-     * 证书文件所在文件路径
-     */
-    private String filePath;
-
-    /**
-     * 证书状态 0 已删除 1已申请 2 通过(生成证书) 3 不通过
-     */
-    private Integer caStatus;
-
-    /**
-     * 证书生成详情关联表id
-     */
-    private Integer caDetailId;
-
-    /**
-     * 创建时间
-     */
-    private Date crateTime;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    private static final long serialVersionUID = 1L;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getUniformSocialCreditCode() {
-        return uniformSocialCreditCode;
-    }
-
-    public void setUniformSocialCreditCode(String uniformSocialCreditCode) {
-        this.uniformSocialCreditCode = uniformSocialCreditCode;
-    }
-
-    public String getCompanyName() {
-        return companyName;
-    }
-
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName;
-    }
-
-    public String getTaxationNum() {
-        return taxationNum;
-    }
-
-    public void setTaxationNum(String taxationNum) {
-        this.taxationNum = taxationNum;
-    }
-
-    public String getConnectAddress() {
-        return connectAddress;
-    }
-
-    public void setConnectAddress(String connectAddress) {
-        this.connectAddress = connectAddress;
-    }
-
-    public String getConnectName() {
-        return connectName;
-    }
-
-    public void setConnectName(String connectName) {
-        this.connectName = connectName;
-    }
-
-    public String getConnectPhone() {
-        return connectPhone;
-    }
-
-    public void setConnectPhone(String connectPhone) {
-        this.connectPhone = connectPhone;
-    }
-
-    public String getConnectEmail() {
-        return connectEmail;
-    }
-
-    public void setConnectEmail(String connectEmail) {
-        this.connectEmail = connectEmail;
-    }
-
-    public Date getEffectiveTimeBeige() {
-        return effectiveTimeBeige;
-    }
-
-    public void setEffectiveTimeBeige(Date effectiveTimeBeige) {
-        this.effectiveTimeBeige = effectiveTimeBeige;
-    }
-
-    public Date getEffectiveTimeEnd() {
-        return effectiveTimeEnd;
-    }
-
-    public void setEffectiveTimeEnd(Date effectiveTimeEnd) {
-        this.effectiveTimeEnd = effectiveTimeEnd;
-    }
-
-    public String getFilePath() {
-        return filePath;
-    }
-
-    public void setFilePath(String filePath) {
-        this.filePath = filePath;
-    }
-
-    public Integer getCaStatus() {
-        return caStatus;
-    }
-
-    public void setCaStatus(Integer caStatus) {
-        this.caStatus = caStatus;
-    }
-
-    public Integer getCaDetailId() {
-        return caDetailId;
-    }
-
-    public void setCaDetailId(Integer caDetailId) {
-        this.caDetailId = caDetailId;
-    }
-
-    public Date getCrateTime() {
-        return crateTime;
-    }
-
-    public void setCrateTime(Date crateTime) {
-        this.crateTime = crateTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", uniformSocialCreditCode=").append(uniformSocialCreditCode);
-        sb.append(", companyName=").append(companyName);
-        sb.append(", taxationNum=").append(taxationNum);
-        sb.append(", connectAddress=").append(connectAddress);
-        sb.append(", connectName=").append(connectName);
-        sb.append(", connectPhone=").append(connectPhone);
-        sb.append(", connectEmail=").append(connectEmail);
-        sb.append(", effectiveTimeBeige=").append(effectiveTimeBeige);
-        sb.append(", effectiveTimeEnd=").append(effectiveTimeEnd);
-        sb.append(", filePath=").append(filePath);
-        sb.append(", caStatus=").append(caStatus);
-        sb.append(", caDetailId=").append(caDetailId);
-        sb.append(", crateTime=").append(crateTime);
-        sb.append(", updateTime=").append(updateTime);
-        sb.append(", remark=").append(remark);
-        sb.append("]");
-        return sb.toString();
-    }
-
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        CaInfo other = (CaInfo) that;
-        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-                && (this.getUniformSocialCreditCode() == null ? other.getUniformSocialCreditCode() == null : this.getUniformSocialCreditCode().equals(other.getUniformSocialCreditCode()))
-                && (this.getCompanyName() == null ? other.getCompanyName() == null : this.getCompanyName().equals(other.getCompanyName()))
-                && (this.getTaxationNum() == null ? other.getTaxationNum() == null : this.getTaxationNum().equals(other.getTaxationNum()))
-                && (this.getConnectAddress() == null ? other.getConnectAddress() == null : this.getConnectAddress().equals(other.getConnectAddress()))
-                && (this.getConnectName() == null ? other.getConnectName() == null : this.getConnectName().equals(other.getConnectName()))
-                && (this.getConnectPhone() == null ? other.getConnectPhone() == null : this.getConnectPhone().equals(other.getConnectPhone()))
-                && (this.getConnectEmail() == null ? other.getConnectEmail() == null : this.getConnectEmail().equals(other.getConnectEmail()))
-                && (this.getEffectiveTimeBeige() == null ? other.getEffectiveTimeBeige() == null : this.getEffectiveTimeBeige().equals(other.getEffectiveTimeBeige()))
-                && (this.getEffectiveTimeEnd() == null ? other.getEffectiveTimeEnd() == null : this.getEffectiveTimeEnd().equals(other.getEffectiveTimeEnd()))
-                && (this.getFilePath() == null ? other.getFilePath() == null : this.getFilePath().equals(other.getFilePath()))
-                && (this.getCaStatus() == null ? other.getCaStatus() == null : this.getCaStatus().equals(other.getCaStatus()))
-                && (this.getCaDetailId() == null ? other.getCaDetailId() == null : this.getCaDetailId().equals(other.getCaDetailId()))
-                && (this.getCrateTime() == null ? other.getCrateTime() == null : this.getCrateTime().equals(other.getCrateTime()))
-                && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
-                && (this.getRemark() == null ? other.getRemark() == null : this.getRemark().equals(other.getRemark()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getUniformSocialCreditCode() == null) ? 0 : getUniformSocialCreditCode().hashCode());
-        result = prime * result + ((getCompanyName() == null) ? 0 : getCompanyName().hashCode());
-        result = prime * result + ((getTaxationNum() == null) ? 0 : getTaxationNum().hashCode());
-        result = prime * result + ((getConnectAddress() == null) ? 0 : getConnectAddress().hashCode());
-        result = prime * result + ((getConnectName() == null) ? 0 : getConnectName().hashCode());
-        result = prime * result + ((getConnectPhone() == null) ? 0 : getConnectPhone().hashCode());
-        result = prime * result + ((getConnectEmail() == null) ? 0 : getConnectEmail().hashCode());
-        result = prime * result + ((getEffectiveTimeBeige() == null) ? 0 : getEffectiveTimeBeige().hashCode());
-        result = prime * result + ((getEffectiveTimeEnd() == null) ? 0 : getEffectiveTimeEnd().hashCode());
-        result = prime * result + ((getFilePath() == null) ? 0 : getFilePath().hashCode());
-        result = prime * result + ((getCaStatus() == null) ? 0 : getCaStatus().hashCode());
-        result = prime * result + ((getCaDetailId() == null) ? 0 : getCaDetailId().hashCode());
-        result = prime * result + ((getCrateTime() == null) ? 0 : getCrateTime().hashCode());
-        result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
-        result = prime * result + ((getRemark() == null) ? 0 : getRemark().hashCode());
-        return result;
-    }
-}

src/main/java/com/bootdo/data/domain/DataApplyDO.java

@@ -1,194 +0,0 @@
-package com.bootdo.data.domain;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 数据备案表
- * 
- * @author admin
- * @email admin@163.com
- * @date 2022-03-01 14:23:15
- */
-public class DataApplyDO implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	//
-	private Long id;
-	//数据处理者名称ID
-	private Long unitId;
-	//重要数据ID
-	private Long dataId;
-	//状态 0:正常 1:删除
-	private String status;
-	//申请者
-	private String uploadUser;
-	//申请者ID
-	private String uploadUserid;
-	//联系人
-	private String liaiseMan;
-	//联系方式
-	private String liaiseWay;
-	//创建时间
-	private Date createTime;
-	//修改时间
-	private Date updateTime;
-
-	private List<Long> dataIds;
-
-	private List<Long> dataIdInfos;
-
-	//合计
-	private String total;
-
-	/**
-	 * 设置：
-	 */
-	public void setId(Long id) {
-		this.id = id;
-	}
-	/**
-	 * 获取：
-	 */
-	public Long getId() {
-		return id;
-	}
-	/**
-	 * 设置：数据处理者名称ID
-	 */
-	public void setUnitId(Long unitId) {
-		this.unitId = unitId;
-	}
-	/**
-	 * 获取：数据处理者名称ID
-	 */
-	public Long getUnitId() {
-		return unitId;
-	}
-	/**
-	 * 设置：重要数据ID
-	 */
-	public void setDataId(Long dataId) {
-		this.dataId = dataId;
-	}
-	/**
-	 * 获取：重要数据ID
-	 */
-	public Long getDataId() {
-		return dataId;
-	}
-	/**
-	 * 设置：状态 0:正常 1:删除
-	 */
-	public void setStatus(String status) {
-		this.status = status;
-	}
-	/**
-	 * 获取：状态 0:正常 1:删除
-	 */
-	public String getStatus() {
-		return status;
-	}
-	/**
-	 * 设置：申请者
-	 */
-	public void setUploadUser(String uploadUser) {
-		this.uploadUser = uploadUser;
-	}
-	/**
-	 * 获取：申请者
-	 */
-	public String getUploadUser() {
-		return uploadUser;
-	}
-	/**
-	 * 设置：申请者ID
-	 */
-	public void setUploadUserid(String uploadUserid) {
-		this.uploadUserid = uploadUserid;
-	}
-	/**
-	 * 获取：申请者ID
-	 */
-	public String getUploadUserid() {
-		return uploadUserid;
-	}
-	/**
-	 * 设置：联系人
-	 */
-	public void setLiaiseMan(String liaiseMan) {
-		this.liaiseMan = liaiseMan;
-	}
-	/**
-	 * 获取：联系人
-	 */
-	public String getLiaiseMan() {
-		return liaiseMan;
-	}
-	/**
-	 * 设置：联系方式
-	 */
-	public void setLiaiseWay(String liaiseWay) {
-		this.liaiseWay = liaiseWay;
-	}
-	/**
-	 * 获取：联系方式
-	 */
-	public String getLiaiseWay() {
-		return liaiseWay;
-	}
-	/**
-	 * 设置：创建时间
-	 */
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-	/**
-	 * 获取：创建时间
-	 */
-	public Date getCreateTime() {
-		return createTime;
-	}
-	/**
-	 * 设置：修改时间
-	 */
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-	/**
-	 * 获取：修改时间
-	 */
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public List<Long> getDataIds() {
-		return dataIds;
-	}
-
-	public void setDataIds(List<Long> dataIds) {
-		this.dataIds = dataIds;
-	}
-
-	public String getTotal() {
-		return total;
-	}
-
-	public void setTotal(String total) {
-		this.total = total;
-	}
-
-	public List<Long> getDataIdInfos() {
-		return dataIdInfos;
-	}
-
-	public void setDataIdInfos(List<Long> dataIdInfos) {
-		this.dataIdInfos = dataIdInfos;
-	}
-
-	@Override
-	public String toString() {
-		return "DataApplyDO{" + "id=" + id + ", unitId=" + unitId + ", dataId=" + dataId + ", status='" + status + '\'' + ", uploadUser='" + uploadUser + '\'' + ", uploadUserid='" + uploadUserid + '\'' + ", liaiseMan='" + liaiseMan + '\'' + ", liaiseWay='" + liaiseWay + '\'' + ", createTime=" + createTime + ", updateTime=" + updateTime + ", dataIds=" + dataIds + ", total='" + total + '\'' + '}';
-	}
-}

src/main/java/com/bootdo/data/domain/DataApprovalDO.java

@@ -1,142 +0,0 @@
-package com.bootdo.data.domain;
-
-import java.io.Serializable;
-import java.util.Date;
-
-
-
-/**
- * 
- * 
- * @author admin
- * @email admin@163.com
- * @date 2022-03-01 17:56:11
- */
-public class DataApprovalDO implements Serializable {
-	private static final long serialVersionUID = 1L;
-	//
-	private Long id;
-	//备案ID
-	private Long applyId;
-	//审批人
-	private String approvalUser;
-	//审批人ID
-	private String approvalUserid;
-	//审批时间
-	private Date approvalTime;
-	//审批状态 0:通过 1:驳回
-	private String approvalStatus;
-	//审批描述
-	private String approvalDesc;
-	//修改时间
-	private Date updateTime;
-	//状态 0:正常 1:删除
-	private String status;
-
-	/**
-	 * 设置：
-	 */
-	public void setId(Long id) {
-		this.id = id;
-	}
-	/**
-	 * 获取：
-	 */
-	public Long getId() {
-		return id;
-	}
-
-	public Long getApplyId() {
-		return applyId;
-	}
-
-	public void setApplyId(Long applyId) {
-		this.applyId = applyId;
-	}
-
-	/**
-	 * 设置：审批人
-	 */
-	public void setApprovalUser(String approvalUser) {
-		this.approvalUser = approvalUser;
-	}
-	/**
-	 * 获取：审批人
-	 */
-	public String getApprovalUser() {
-		return approvalUser;
-	}
-	/**
-	 * 设置：审批人ID
-	 */
-	public void setApprovalUserid(String approvalUserid) {
-		this.approvalUserid = approvalUserid;
-	}
-	/**
-	 * 获取：审批人ID
-	 */
-	public String getApprovalUserid() {
-		return approvalUserid;
-	}
-	/**
-	 * 设置：审批时间
-	 */
-	public void setApprovalTime(Date approvalTime) {
-		this.approvalTime = approvalTime;
-	}
-	/**
-	 * 获取：审批时间
-	 */
-	public Date getApprovalTime() {
-		return approvalTime;
-	}
-	/**
-	 * 设置：审批描述
-	 */
-	public void setApprovalDesc(String approvalDesc) {
-		this.approvalDesc = approvalDesc;
-	}
-	/**
-	 * 获取：审批描述
-	 */
-	public String getApprovalDesc() {
-		return approvalDesc;
-	}
-	/**
-	 * 设置：修改时间
-	 */
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-	/**
-	 * 获取：修改时间
-	 */
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-	/**
-	 * 设置：状态 0:正常 1:删除
-	 */
-	public void setStatus(String status) {
-		this.status = status;
-	}
-	/**
-	 * 获取：状态 0:正常 1:删除
-	 */
-	public String getStatus() {
-		return status;
-	}
-
-	public String getApprovalStatus() {
-		return approvalStatus;
-	}
-
-	public void setApprovalStatus(String approvalStatus) {
-		this.approvalStatus = approvalStatus;
-	}
-
-	@Override
-	public String toString() {
-		return "DataApprovalDO{" + "id=" + id + ", applyId=" + applyId + ", approvalUser='" + approvalUser + '\'' + ", approvalUserid='" + approvalUserid + '\'' + ", approvalTime=" + approvalTime + ", approvalStatus='" + approvalStatus + '\'' + ", approvalDesc='" + approvalDesc + '\'' + ", updateTime=" + updateTime + ", status='" + status + '\'' + '}';
-	}
-}

src/main/java/com/bootdo/data/domain/DataInfoDO.java

@@ -1,378 +0,0 @@
-package com.bootdo.data.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 重要数据表
- * 
- * @author admin
- * @email admin@163.com
- * @date 2022-02-27 17:27:36
- */
-public class DataInfoDO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    //
-    private Long id;
-    // 数据来源
-    private String dataSource;
-    // 数据名称
-    private String dataName;
-    // 数据级别:01终验数据 02 核心数据
-    private String dataLevel;
-    // 数据类别
-    private String dataType;
-    // 其它数据类别
-    private String otherType;
-    // 数组子类
-    private String dataSub;
-    // 二级子类
-    private String dataAdjSub;
-    // 数据规模
-    private String dataScope;
-    // 数据目的
-    private String dataResult;
-    // 数据存储位置
-    private String dataLocation;
-    // 数据范围
-    private String dataRange;
-    // 负责人(管理部门或责任人)
-    private String dataRuler;
-    // 对外共享(范围 内容)
-    private String shareRange;
-    // 跨境传输(范围 内容)
-    private String crossRange;
-    // 安全保护措施
-    private String dataSafety;
-    // 备注
-    private String dataDesc;
-    // 状态 0:正常 1:删除 2:已上报 3:通过审核 4:驳回
-    private String dataStatus;
-    // 数据上传者
-    private String uploadUser;
-    // 数据上传者ID
-    private String uploadUserid;
-    // 上传时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date uploadTime;
-    // 修改时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    /**
-     * 设置：
-     */
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    /**
-     * 获取：
-     */
-    public Long getId() {
-        return id;
-    }
-
-    /**
-     * 设置：数据来源
-     */
-    public void setDataSource(String dataSource) {
-        this.dataSource = dataSource;
-    }
-
-    /**
-     * 获取：数据来源
-     */
-    public String getDataSource() {
-        return dataSource;
-    }
-
-    /**
-     * 设置：数据名称
-     */
-    public void setDataName(String dataName) {
-        this.dataName = dataName;
-    }
-
-    /**
-     * 获取：数据名称
-     */
-    public String getDataName() {
-        return dataName;
-    }
-
-    /**
-     * 设置：数据级别:01终验数据 02 核心数据
-     */
-    public void setDataLevel(String dataLevel) {
-        this.dataLevel = dataLevel;
-    }
-
-    /**
-     * 获取：数据级别:01终验数据 02 核心数据
-     */
-    public String getDataLevel() {
-        return dataLevel;
-    }
-
-    /**
-     * 设置：数据类别
-     */
-    public void setDataType(String dataType) {
-        this.dataType = dataType;
-    }
-
-    /**
-     * 获取：数据类别
-     */
-    public String getDataType() {
-        return dataType;
-    }
-
-    /**
-     * 设置：数组子类
-     */
-    public void setDataSub(String dataSub) {
-        this.dataSub = dataSub;
-    }
-
-    /**
-     * 获取：数组子类
-     */
-    public String getDataSub() {
-        return dataSub;
-    }
-
-    /**
-     * 设置：二级子类
-     */
-    public void setDataAdjSub(String dataAdjSub) {
-        this.dataAdjSub = dataAdjSub;
-    }
-
-    /**
-     * 获取：二级子类
-     */
-    public String getDataAdjSub() {
-        return dataAdjSub;
-    }
-
-    /**
-     * 设置：数据规模
-     */
-    public void setDataScope(String dataScope) {
-        this.dataScope = dataScope;
-    }
-
-    /**
-     * 获取：数据规模
-     */
-    public String getDataScope() {
-        return dataScope;
-    }
-
-    /**
-     * 设置：数据目的
-     */
-    public void setDataResult(String dataResult) {
-        this.dataResult = dataResult;
-    }
-
-    /**
-     * 获取：数据目的
-     */
-    public String getDataResult() {
-        return dataResult;
-    }
-
-    /**
-     * 设置：数据存储位置
-     */
-    public void setDataLocation(String dataLocation) {
-        this.dataLocation = dataLocation;
-    }
-
-    /**
-     * 获取：数据存储位置
-     */
-    public String getDataLocation() {
-        return dataLocation;
-    }
-
-    /**
-     * 设置：数据范围
-     */
-    public void setDataRange(String dataRange) {
-        this.dataRange = dataRange;
-    }
-
-    /**
-     * 获取：数据范围
-     */
-    public String getDataRange() {
-        return dataRange;
-    }
-
-    /**
-     * 设置：负责人(管理部门或责任人)
-     */
-    public void setDataRuler(String dataRuler) {
-        this.dataRuler = dataRuler;
-    }
-
-    /**
-     * 获取：负责人(管理部门或责任人)
-     */
-    public String getDataRuler() {
-        return dataRuler;
-    }
-
-    /**
-     * 设置：对外共享(范围 内容)
-     */
-    public void setShareRange(String shareRange) {
-        this.shareRange = shareRange;
-    }
-
-    /**
-     * 获取：对外共享(范围 内容)
-     */
-    public String getShareRange() {
-        return shareRange;
-    }
-
-    /**
-     * 设置：跨境传输(范围 内容)
-     */
-    public void setCrossRange(String crossRange) {
-        this.crossRange = crossRange;
-    }
-
-    /**
-     * 获取：跨境传输(范围 内容)
-     */
-    public String getCrossRange() {
-        return crossRange;
-    }
-
-    /**
-     * 设置：安全保护措施
-     */
-    public void setDataSafety(String dataSafety) {
-        this.dataSafety = dataSafety;
-    }
-
-    /**
-     * 获取：安全保护措施
-     */
-    public String getDataSafety() {
-        return dataSafety;
-    }
-
-    /**
-     * 设置：备注
-     */
-    public void setDataDesc(String dataDesc) {
-        this.dataDesc = dataDesc;
-    }
-
-    /**
-     * 获取：备注
-     */
-    public String getDataDesc() {
-        return dataDesc;
-    }
-
-    /**
-     * 设置：状态 0:正常 1:删除 2:已上报 3:通过审核 4:驳回
-     */
-    public void setDataStatus(String dataStatus) {
-        this.dataStatus = dataStatus;
-    }
-
-    /**
-     * 获取：状态 0:正常 1:删除 2:已上报 3:通过审核 4:驳回
-     */
-    public String getDataStatus() {
-        return dataStatus;
-    }
-
-    /**
-     * 设置：数据上传者
-     */
-    public void setUploadUser(String uploadUser) {
-        this.uploadUser = uploadUser;
-    }
-
-    /**
-     * 获取：数据上传者
-     */
-    public String getUploadUser() {
-        return uploadUser;
-    }
-
-    /**
-     * 设置：数据上传者ID
-     */
-    public void setUploadUserid(String uploadUserid) {
-        this.uploadUserid = uploadUserid;
-    }
-
-    /**
-     * 获取：数据上传者ID
-     */
-    public String getUploadUserid() {
-        return uploadUserid;
-    }
-
-    /**
-     * 设置：上传时间
-     */
-    public void setUploadTime(Date uploadTime) {
-        this.uploadTime = uploadTime;
-    }
-
-    /**
-     * 获取：上传时间
-     */
-    public Date getUploadTime() {
-        return uploadTime;
-    }
-
-    /**
-     * 设置：修改时间
-     */
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    /**
-     * 获取：修改时间
-     */
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public String getOtherType() {
-        return otherType;
-    }
-
-    public void setOtherType(String otherType) {
-        this.otherType = otherType;
-    }
-
-    @Override
-    public String toString() {
-        return "DataInfoDO{" + "id=" + id + ", dataSource='" + dataSource + '\'' + ", dataName='" + dataName + '\''
-            + ", dataLevel='" + dataLevel + '\'' + ", dataType='" + dataType + '\'' + ", otherType='" + otherType + '\''
-            + ", dataSub='" + dataSub + '\'' + ", dataAdjSub='" + dataAdjSub + '\'' + ", dataScope='" + dataScope + '\''
-            + ", dataResult='" + dataResult + '\'' + ", dataLocation='" + dataLocation + '\'' + ", dataRange='"
-            + dataRange + '\'' + ", dataRuler='" + dataRuler + '\'' + ", shareRange='" + shareRange + '\''
-            + ", crossRange='" + crossRange + '\'' + ", dataSafety='" + dataSafety + '\'' + ", dataDesc='" + dataDesc
-            + '\'' + ", dataStatus='" + dataStatus + '\'' + ", uploadUser='" + uploadUser + '\'' + ", uploadUserid='"
-            + uploadUserid + '\'' + ", uploadTime=" + uploadTime + ", updateTime=" + updateTime + '}';
-    }
-}

src/main/java/com/bootdo/data/domain/DataPartDO.java

@@ -1,122 +0,0 @@
-package com.bootdo.data.domain;
-
-import java.io.Serializable;
-import java.util.Date;
-
-
-
-/**
- * 分类分级
- * 
- * @author admin
- * @email admin@163.com
- * @date 2022-02-27 23:33:17
- */
-public class DataPartDO implements Serializable {
-	private static final long serialVersionUID = 1L;
-	
-	//
-	private Long partId;
-	//上级部门ID，一级部门为0
-	private Long parentId;
-	//部门名称
-	private String partName;
-	//描述
-	private String partDesc;
-	//描述
-	private String partIsMajor;
-	//排序
-	private Integer orderNum;
-	//是否删除  -1：已删除  0：正常
-	private Integer delFlag;
-
-	/**
-	 * 设置：
-	 */
-	public void setPartId(Long partId) {
-		this.partId = partId;
-	}
-	/**
-	 * 获取：
-	 */
-	public Long getPartId() {
-		return partId;
-	}
-	/**
-	 * 设置：上级部门ID，一级部门为0
-	 */
-	public void setParentId(Long parentId) {
-		this.parentId = parentId;
-	}
-	/**
-	 * 获取：上级部门ID，一级部门为0
-	 */
-	public Long getParentId() {
-		return parentId;
-	}
-	/**
-	 * 设置：部门名称
-	 */
-	public void setPartName(String partName) {
-		this.partName = partName;
-	}
-	/**
-	 * 获取：部门名称
-	 */
-	public String getPartName() {
-		return partName;
-	}
-	/**
-	 * 设置：描述
-	 */
-	public void setPartDesc(String partDesc) {
-		this.partDesc = partDesc;
-	}
-	/**
-	 * 获取：描述
-	 */
-	public String getPartDesc() {
-		return partDesc;
-	}
-	/**
-	 * 设置：描述
-	 */
-	public void setPartIsMajor(String partIsMajor) {
-		this.partIsMajor = partIsMajor;
-	}
-	/**
-	 * 获取：描述
-	 */
-	public String getPartIsMajor() {
-		return partIsMajor;
-	}
-	/**
-	 * 设置：排序
-	 */
-	public void setOrderNum(Integer orderNum) {
-		this.orderNum = orderNum;
-	}
-	/**
-	 * 获取：排序
-	 */
-	public Integer getOrderNum() {
-		return orderNum;
-	}
-	/**
-	 * 设置：是否删除  -1：已删除  0：正常
-	 */
-	public void setDelFlag(Integer delFlag) {
-		this.delFlag = delFlag;
-	}
-	/**
-	 * 获取：是否删除  -1：已删除  0：正常
-	 */
-	public Integer getDelFlag() {
-		return delFlag;
-	}
-
-	@Override
-	public String toString() {
-		return "DataPartDO{" + "partId=" + partId + ", parentId=" + parentId + ", partName='" + partName + '\'' + ", partDesc='" + partDesc + '\'' + ", partIsMajor='" + partIsMajor + '\'' + ", orderNum=" + orderNum + ", delFlag=" + delFlag + '}';
-	}
-}

src/main/java/com/bootdo/data/domain/DataRelationDO.java

@@ -1,61 +0,0 @@
-package com.bootdo.data.domain;
-
-import java.io.Serializable;
-import java.util.Date;
-
-
-
-/**
- * 数据备案与重要数据关系表
- * 
- * @author admin
- * @email admin@163.com
- * @date 2022-03-01 14:26:26
- */
-public class DataRelationDO implements Serializable {
-	private static final long serialVersionUID = 1L;
-	
-	//
-	private Long id;
-	//备案ID
-	private Long applyId;
-	//重要数据ID
-	private Long dataId;
-
-	/**
-	 * 设置：
-	 */
-	public void setId(Long id) {
-		this.id = id;
-	}
-	/**
-	 * 获取：
-	 */
-	public Long getId() {
-		return id;
-	}
-	/**
-	 * 设置：备案ID
-	 */
-	public void setApplyId(Long applyId) {
-		this.applyId = applyId;
-	}
-	/**
-	 * 获取：备案ID
-	 */
-	public Long getApplyId() {
-		return applyId;
-	}
-	/**
-	 * 设置：重要数据ID
-	 */
-	public void setDataId(Long dataId) {
-		this.dataId = dataId;
-	}
-	/**
-	 * 获取：重要数据ID
-	 */
-	public Long getDataId() {
-		return dataId;
-	}
-}

src/main/java/com/bootdo/data/domain/DataUploadDO.java

@@ -1,381 +0,0 @@
-package com.bootdo.data.domain;
-
-import java.io.Serializable;
-import java.util.Date;
-
-
-
-/**
- * @Description: 重要数据
- * @Author: wangp
- * @Date: 2022/2/27 14:49
- */
-public class DataUploadDO implements Serializable {
-	private static final long serialVersionUID = 1L;
-	
-	//
-	private Long id;
-	//数据处理者名称
-	private String reporterUnit;
-	//数据处理者名称 省份
-	private String unitProvince;
-	//数据处理者名称 城市
-	private String unitCity;
-	//数据处理者名称 其它信息
-	private String unitOther;
-	//所属行业子类
-	private String dataIndustry;
-	//数据来源
-	private String dataSource;
-	//数据名称
-	private String dataName;
-	//数据级别:01终验数据 02 核心数据
-	private String dataLevel;
-	//数据类别
-	private String dataType;
-	//数组子类
-	private String dataSub;
-	//二级子类
-	private String dataAdjSub;
-	//数据规模
-	private String dataScope;
-	//数据目的
-	private String dataResult;
-	//数据存储位置
-	private String dataLocation;
-	//数据范围
-	private String dataRange;
-	//负责人(管理部门或责任人)
-	private String dataRuler;
-	//对外共享(范围 内容)
-	private String shareRange;
-	//跨境传输(范围 内容)
-	private String crossRange;
-	//安全保护措施
-	private String dataSafety;
-	//备注
-	private String dataDesc;
-	//状态 0:正常 1:删除
-	private String dataStatus;
-	//数据上传者
-	private String uploadUser;
-	//数据上传者ID
-	private String uploadUserid;
-	//上传时间
-	private Date uploadTime;
-	//修改时间
-	private Date updateTime;
-
-	/**
-	 * 设置：
-	 */
-	public void setId(Long id) {
-		this.id = id;
-	}
-	/**
-	 * 获取：
-	 */
-	public Long getId() {
-		return id;
-	}
-	/**
-	 * 设置：数据处理者名称
-	 */
-	public void setReporterUnit(String reporterUnit) {
-		this.reporterUnit = reporterUnit;
-	}
-	/**
-	 * 获取：数据处理者名称
-	 */
-	public String getReporterUnit() {
-		return reporterUnit;
-	}
-	/**
-	 * 设置：数据处理者名称 省份
-	 */
-	public void setUnitProvince(String unitProvince) {
-		this.unitProvince = unitProvince;
-	}
-	/**
-	 * 获取：数据处理者名称 省份
-	 */
-	public String getUnitProvince() {
-		return unitProvince;
-	}
-	/**
-	 * 设置：数据处理者名称 城市
-	 */
-	public void setUnitCity(String unitCity) {
-		this.unitCity = unitCity;
-	}
-	/**
-	 * 获取：数据处理者名称 城市
-	 */
-	public String getUnitCity() {
-		return unitCity;
-	}
-	/**
-	 * 设置：数据处理者名称 其它信息
-	 */
-	public void setUnitOther(String unitOther) {
-		this.unitOther = unitOther;
-	}
-	/**
-	 * 获取：数据处理者名称 其它信息
-	 */
-	public String getUnitOther() {
-		return unitOther;
-	}
-	/**
-	 * 设置：所属行业子类
-	 */
-	public void setDataIndustry(String dataIndustry) {
-		this.dataIndustry = dataIndustry;
-	}
-	/**
-	 * 获取：所属行业子类
-	 */
-	public String getDataIndustry() {
-		return dataIndustry;
-	}
-	/**
-	 * 设置：数据来源
-	 */
-	public void setDataSource(String dataSource) {
-		this.dataSource = dataSource;
-	}
-	/**
-	 * 获取：数据来源
-	 */
-	public String getDataSource() {
-		return dataSource;
-	}
-	/**
-	 * 设置：数据名称
-	 */
-	public void setDataName(String dataName) {
-		this.dataName = dataName;
-	}
-	/**
-	 * 获取：数据名称
-	 */
-	public String getDataName() {
-		return dataName;
-	}
-	/**
-	 * 设置：数据级别:01终验数据 02 核心数据
-	 */
-	public void setDataLevel(String dataLevel) {
-		this.dataLevel = dataLevel;
-	}
-	/**
-	 * 获取：数据级别:01终验数据 02 核心数据
-	 */
-	public String getDataLevel() {
-		return dataLevel;
-	}
-	/**
-	 * 设置：数据类别
-	 */
-	public void setDataType(String dataType) {
-		this.dataType = dataType;
-	}
-	/**
-	 * 获取：数据类别
-	 */
-	public String getDataType() {
-		return dataType;
-	}
-	/**
-	 * 设置：数组子类
-	 */
-	public void setDataSub(String dataSub) {
-		this.dataSub = dataSub;
-	}
-	/**
-	 * 获取：数组子类
-	 */
-	public String getDataSub() {
-		return dataSub;
-	}
-	/**
-	 * 设置：二级子类
-	 */
-	public void setDataAdjSub(String dataAdjSub) {
-		this.dataAdjSub = dataAdjSub;
-	}
-	/**
-	 * 获取：二级子类
-	 */
-	public String getDataAdjSub() {
-		return dataAdjSub;
-	}
-	/**
-	 * 设置：数据规模
-	 */
-	public void setDataScope(String dataScope) {
-		this.dataScope = dataScope;
-	}
-	/**
-	 * 获取：数据规模
-	 */
-	public String getDataScope() {
-		return dataScope;
-	}
-	/**
-	 * 设置：数据目的
-	 */
-	public void setDataResult(String dataResult) {
-		this.dataResult = dataResult;
-	}
-	/**
-	 * 获取：数据目的
-	 */
-	public String getDataResult() {
-		return dataResult;
-	}
-	/**
-	 * 设置：数据存储位置
-	 */
-	public void setDataLocation(String dataLocation) {
-		this.dataLocation = dataLocation;
-	}
-	/**
-	 * 获取：数据存储位置
-	 */
-	public String getDataLocation() {
-		return dataLocation;
-	}
-	/**
-	 * 设置：数据范围
-	 */
-	public void setDataRange(String dataRange) {
-		this.dataRange = dataRange;
-	}
-	/**
-	 * 获取：数据范围
-	 */
-	public String getDataRange() {
-		return dataRange;
-	}
-	/**
-	 * 设置：负责人(管理部门或责任人)
-	 */
-	public void setDataRuler(String dataRuler) {
-		this.dataRuler = dataRuler;
-	}
-	/**
-	 * 获取：负责人(管理部门或责任人)
-	 */
-	public String getDataRuler() {
-		return dataRuler;
-	}
-	/**
-	 * 设置：对外共享(范围 内容)
-	 */
-	public void setShareRange(String shareRange) {
-		this.shareRange = shareRange;
-	}
-	/**
-	 * 获取：对外共享(范围 内容)
-	 */
-	public String getShareRange() {
-		return shareRange;
-	}
-	/**
-	 * 设置：跨境传输(范围 内容)
-	 */
-	public void setCrossRange(String crossRange) {
-		this.crossRange = crossRange;
-	}
-	/**
-	 * 获取：跨境传输(范围 内容)
-	 */
-	public String getCrossRange() {
-		return crossRange;
-	}
-	/**
-	 * 设置：安全保护措施
-	 */
-	public void setDataSafety(String dataSafety) {
-		this.dataSafety = dataSafety;
-	}
-	/**
-	 * 获取：安全保护措施
-	 */
-	public String getDataSafety() {
-		return dataSafety;
-	}
-	/**
-	 * 设置：备注
-	 */
-	public void setDataDesc(String dataDesc) {
-		this.dataDesc = dataDesc;
-	}
-	/**
-	 * 获取：备注
-	 */
-	public String getDataDesc() {
-		return dataDesc;
-	}
-	/**
-	 * 设置：状态 0:正常 1:删除
-	 */
-	public void setDataStatus(String dataStatus) {
-		this.dataStatus = dataStatus;
-	}
-	/**
-	 * 获取：状态 0:正常 1:删除
-	 */
-	public String getDataStatus() {
-		return dataStatus;
-	}
-	/**
-	 * 设置：数据上传者
-	 */
-	public void setUploadUser(String uploadUser) {
-		this.uploadUser = uploadUser;
-	}
-	/**
-	 * 获取：数据上传者
-	 */
-	public String getUploadUser() {
-		return uploadUser;
-	}
-	/**
-	 * 设置：数据上传者ID
-	 */
-	public void setUploadUserid(String uploadUserid) {
-		this.uploadUserid = uploadUserid;
-	}
-	/**
-	 * 获取：数据上传者ID
-	 */
-	public String getUploadUserid() {
-		return uploadUserid;
-	}
-	/**
-	 * 设置：上传时间
-	 */
-	public void setUploadTime(Date uploadTime) {
-		this.uploadTime = uploadTime;
-	}
-	/**
-	 * 获取：上传时间
-	 */
-	public Date getUploadTime() {
-		return uploadTime;
-	}
-	/**
-	 * 设置：修改时间
-	 */
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-	/**
-	 * 获取：修改时间
-	 */
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-}

src/main/java/com/bootdo/data/entity/TfInfoEnterprise.java

@@ -1,316 +0,0 @@
-package com.bootdo.data.entity;
-
-import java.util.Date;
-import java.io.Serializable;
-
-/**
- * 法人表(TfInfoEnterprise)实体类
- *
- * @author makejava
- * @since 2022-05-09 15:51:40
- */
-public class TfInfoEnterprise implements Serializable {
-    private static final long serialVersionUID = 880668660428282890L;
-    /**
-     * 主键
-     */
-    private Integer id;
-    /**
-     * 统一社会信用代码
-     */
-    private String uniformSocialCreditCode;
-    /**
-     * 公司名称
-     */
-    private String companyName;
-    /**
-     * 登录密码
-     */
-    private String password;
-    /**
-     * 联系人
-     */
-    private String contacts;
-    /**
-     * 所属行业: 原材料工业 装备工业 消费品工业 电子信息制造业 软件和信息技术服务业 民爆
-     */
-    private String industry;
-    /**
-     * 联系电话
-     */
-    private String mobile;
-    /**
-     * 联系地址
-     */
-    private String address;
-    /**
-     * 联系邮箱
-     */
-    private String email;
-    /**
-     * 账号状态 (1可用 ,0禁用)
-     */
-    private Integer state;
-    /**
-     * 省
-     */
-    private String province;
-    /**
-     * 市
-     */
-    private String city;
-    /**
-     * 区
-     */
-    private String district;
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-    /**
-     * 服务类型
-     */
-    private String serviceType;
-    /**
-     * 经营期限截止日期
-     */
-    private Date asOfDate;
-    /**
-     * 营业执照
-     */
-    private String businessLicence;
-    /**
-     * 信用中国
-     */
-    private String creditChina;
-    /**
-     * 税务登记号
-     */
-    private String taxRegistrationNumber;
-    /**
-     * 工商注册登记号
-     */
-    private String registrationNumber;
-    /**
-     * 机构代码
-     */
-    private String organizationCode;
-    /**
-     * 结算银行
-     */
-    private String settlingBank;
-    /**
-     * 生效时间
-     */
-    private String effectTime;
-    /**
-     * 失效时间
-     */
-    private String expirationTime;
-
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getUniformSocialCreditCode() {
-        return uniformSocialCreditCode;
-    }
-
-    public void setUniformSocialCreditCode(String uniformSocialCreditCode) {
-        this.uniformSocialCreditCode = uniformSocialCreditCode;
-    }
-
-    public String getCompanyName() {
-        return companyName;
-    }
-
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getContacts() {
-        return contacts;
-    }
-
-    public void setContacts(String contacts) {
-        this.contacts = contacts;
-    }
-
-    public String getIndustry() {
-        return industry;
-    }
-
-    public void setIndustry(String industry) {
-        this.industry = industry;
-    }
-
-    public String getMobile() {
-        return mobile;
-    }
-
-    public void setMobile(String mobile) {
-        this.mobile = mobile;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public String getProvince() {
-        return province;
-    }
-
-    public void setProvince(String province) {
-        this.province = province;
-    }
-
-    public String getCity() {
-        return city;
-    }
-
-    public void setCity(String city) {
-        this.city = city;
-    }
-
-    public String getDistrict() {
-        return district;
-    }
-
-    public void setDistrict(String district) {
-        this.district = district;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getServiceType() {
-        return serviceType;
-    }
-
-    public void setServiceType(String serviceType) {
-        this.serviceType = serviceType;
-    }
-
-    public Date getAsOfDate() {
-        return asOfDate;
-    }
-
-    public void setAsOfDate(Date asOfDate) {
-        this.asOfDate = asOfDate;
-    }
-
-    public String getBusinessLicence() {
-        return businessLicence;
-    }
-
-    public void setBusinessLicence(String businessLicence) {
-        this.businessLicence = businessLicence;
-    }
-
-    public String getCreditChina() {
-        return creditChina;
-    }
-
-    public void setCreditChina(String creditChina) {
-        this.creditChina = creditChina;
-    }
-
-    public String getTaxRegistrationNumber() {
-        return taxRegistrationNumber;
-    }
-
-    public void setTaxRegistrationNumber(String taxRegistrationNumber) {
-        this.taxRegistrationNumber = taxRegistrationNumber;
-    }
-
-    public String getRegistrationNumber() {
-        return registrationNumber;
-    }
-
-    public void setRegistrationNumber(String registrationNumber) {
-        this.registrationNumber = registrationNumber;
-    }
-
-    public String getOrganizationCode() {
-        return organizationCode;
-    }
-
-    public void setOrganizationCode(String organizationCode) {
-        this.organizationCode = organizationCode;
-    }
-
-    public String getSettlingBank() {
-        return settlingBank;
-    }
-
-    public void setSettlingBank(String settlingBank) {
-        this.settlingBank = settlingBank;
-    }
-
-    public String getEffectTime() {
-        return effectTime;
-    }
-
-    public void setEffectTime(String effectTime) {
-        this.effectTime = effectTime;
-    }
-
-    public String getExpirationTime() {
-        return expirationTime;
-    }
-
-    public void setExpirationTime(String expirationTime) {
-        this.expirationTime = expirationTime;
-    }
-
-}

src/main/java/com/bootdo/data/service/CaDetailService.java

@@ -1,34 +0,0 @@
-package com.bootdo.data.service;
-
-import com.bootdo.data.domain.CaDetail;
-
-import java.util.List;
-
-import com.bootdo.data.domain.CaDetailExample;
-
-public interface CaDetailService {
-
-
-    long countByExample(CaDetailExample example);
-
-    int deleteByExample(CaDetailExample example);
-
-    int deleteByPrimaryKey(Integer id);
-
-    int insert(CaDetail record);
-
-    int insertSelective(CaDetail record);
-
-    List<CaDetail> selectByExample(CaDetailExample example);
-
-    CaDetail selectByPrimaryKey(Integer id);
-
-    int updateByExampleSelective(CaDetail record, CaDetailExample example);
-
-    int updateByExample(CaDetail record, CaDetailExample example);
-
-    int updateByPrimaryKeySelective(CaDetail record);
-
-    int updateByPrimaryKey(CaDetail record);
-
-}

src/main/java/com/bootdo/data/service/CaInfoService.java

@@ -1,74 +0,0 @@
-package com.bootdo.data.service;
-
-import java.util.List;
-
-import com.bootdo.common.utils.Query;
-import com.bootdo.data.domain.CaInfo;
-import com.bootdo.data.domain.CaInfoExample;
-
-public interface CaInfoService {
-
-
-    long countByExample(CaInfoExample example);
-
-    int deleteByExample(CaInfoExample example);
-
-    int deleteByPrimaryKey(Integer id);
-
-    int insert(CaInfo record);
-
-    int insertSelective(CaInfo record);
-
-    List<CaInfo> selectByExample(CaInfoExample example);
-
-    CaInfo selectByPrimaryKey(Integer id);
-
-    int updateByExampleSelective(CaInfo record, CaInfoExample example);
-
-    int updateByExample(CaInfo record, CaInfoExample example);
-
-    int updateByPrimaryKeySelective(CaInfo record);
-
-    int updateByPrimaryKey(CaInfo record);
-
-    /**
-     * 分页条件查询 证书列表数据
-     *
-     * @param query
-     * @return
-     */
-    List<CaInfo> queryPage(Query query);
-
-    /**
-     * 分页条件查询 证书列表数据 条数
-     *
-     * @param query
-     * @return
-     */
-    int queryPageCount(Query query);
-
-    /**
-     * 根据主键获取
-     *
-     * @param id
-     * @return
-     */
-    CaInfo queryById(Integer id);
-
-    /**
-     * 证书状态置为无效
-     *
-     * @param id
-     */
-    void caStatusUpdate(Integer id, Integer caStatus) throws Exception;
-
-    /**
-     * 根据公司名称和 统一社会信用代码 获取最新的 企业ca
-     *
-     * @param companyName
-     * @param uniformSocialCreditCode
-     * @return
-     */
-    CaInfo getEnterpriseCaByCompanyNameAndUniformSocialCreditCode(String companyName, String uniformSocialCreditCode);
-
-}

src/main/java/com/bootdo/data/service/DataApplyService.java

@@ -1,30 +0,0 @@
-package com.bootdo.data.service;
-
-import com.bootdo.data.domain.DataApplyDO;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 数据备案表
- * 
- * @author admin
- * @email admin@163.com
- * @date 2022-03-01 14:23:15
- */
-public interface DataApplyService {
-	
-	DataApplyDO get(Long id);
-	
-	List<DataApplyDO> list(Map<String, Object> map);
-	
-	int count(Map<String, Object> map);
-	
-	int save(DataApplyDO dataApply);
-	
-	int update(DataApplyDO dataApply);
-	
-	int remove(Long id);
-	
-	int batchRemove(Long[] ids);
-}

src/main/java/com/bootdo/data/service/DataApprovalService.java

@@ -1,35 +0,0 @@
-package com.bootdo.data.service;
-
-import java.util.List;
-import java.util.Map;
-
-import com.bootdo.data.domain.DataApprovalDO;
-import com.bootdo.data.domain.UnitApplyInfoDO;
-
-/**
- * 
- * 
- * @author admin
- * @email admin@163.com
- * @date 2022-03-01 17:56:11
- */
-public interface DataApprovalService {
-	
-	DataApprovalDO get(Long id);
-	
-	List<UnitApplyInfoDO> list(Map<String, Object> map);
-	
-	int count(Map<String, Object> map);
-	
-	int verifyInfo(DataApprovalDO dataApproval);
-	
-	int update(DataApprovalDO dataApproval);
-	
-	int remove(Long id);
-	
-	int batchRemove(Long[] ids);
-
-    boolean approval(Long applyId, String status, String desc);
-
-    List<UnitApplyInfoDO> viewList(Map<String, Object> params);
-}

src/main/java/com/bootdo/data/service/DataInfoService.java

@@ -1,39 +0,0 @@
-package com.bootdo.data.service;
-
-import java.util.List;
-import java.util.Map;
-
-import com.bootdo.data.domain.DataInfoDO;
-
-/**
- * 重要数据表
- * 
- * @author admin
- * @email admin@163.com
- * @date 2022-02-27 17:27:36
- */
-public interface DataInfoService {
-	
-	DataInfoDO get(Long id);
-	
-	List<DataInfoDO> list(Map<String, Object> map);
-	
-	int count(Map<String, Object> map);
-	
-	int save(DataInfoDO dataInfo);
-	
-	int update(DataInfoDO dataInfo);
-	
-	int remove(Long id);
-	
-	int batchRemove(Long[] ids);
-
-	/**
-	 * @Description:重要数据和核心数据目录备案清单 初始化
-	 * @Author: wangp
-	 * @Date: 2022/3/1 19:05
-	 * @param map
-	 * @Return: List<DataInfoDO>
-	 */
-    List<DataInfoDO> querylistInfo(Map<String, Object> map);
-}

src/main/java/com/bootdo/data/service/DataPartService.java

@@ -1,30 +0,0 @@
-package com.bootdo.data.service;
-
-import com.bootdo.data.domain.DataPartDO;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 分类分级
- * 
- * @author admin
- * @email admin@163.com
- * @date 2022-02-27 23:33:17
- */
-public interface DataPartService {
-	
-	DataPartDO get(Long partId);
-	
-	List<DataPartDO> list(Map<String, Object> map);
-	
-	int count(Map<String, Object> map);
-	
-	int save(DataPartDO dataPart);
-	
-	int update(DataPartDO dataPart);
-	
-	int remove(Long partId);
-	
-	int batchRemove(Long[] partIds);
-}

src/main/java/com/bootdo/data/service/DataUploadService.java

@@ -1,29 +0,0 @@
-package com.bootdo.data.service;
-
-
-import com.bootdo.data.domain.DataUploadDO;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 重要数据
- * @Author: wangp
- * @Date: 2022/2/27 14:49
- */
-public interface DataUploadService {
-	
-	DataUploadDO get(Long id);
-	
-	List<DataUploadDO> list(Map<String, Object> map);
-	
-	int count(Map<String, Object> map);
-	
-	int save(DataUploadDO dataUpload);
-	
-	int update(DataUploadDO dataUpload);
-	
-	int remove(Long id);
-	
-	int batchRemove(Long[] ids);
-}

src/main/java/com/bootdo/data/service/TfInfoEnterpriseService.java

@@ -1,88 +0,0 @@
-package com.bootdo.data.service;
-
-import com.bootdo.data.entity.TfInfoEnterprise;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 法人表(TfInfoEnterprise)表服务接口
- *
- * @author makejava
- * @since 2022-05-09 15:51:40
- */
-public interface TfInfoEnterpriseService {
-
-    /**
-     * 通过ID查询单条数据
-     *
-     * @param id 主键
-     * @return 实例对象
-     */
-    TfInfoEnterprise queryById(Integer id);
-
-    /**
-     * 查询多条数据
-     *
-     * @param offset 查询起始位置
-     * @param limit  查询条数
-     * @return 对象列表
-     */
-    List<TfInfoEnterprise> queryAllByLimit(int offset, int limit);
-
-    /**
-     * 新增数据
-     *
-     * @param tfInfoEnterprise 实例对象
-     * @return 实例对象
-     */
-    TfInfoEnterprise insert(TfInfoEnterprise tfInfoEnterprise);
-
-    /**
-     * 修改数据
-     *
-     * @param tfInfoEnterprise 实例对象
-     * @return 实例对象
-     */
-    TfInfoEnterprise update(TfInfoEnterprise tfInfoEnterprise);
-
-    /**
-     * 通过主键删除数据
-     *
-     * @param id 主键
-     * @return 是否成功
-     */
-    boolean deleteById(Integer id);
-
-
-    /**
-     * 分页时获取总count
-     *
-     * @param map
-     * @return
-     */
-    int queryPageCount(Map<String, Object> map);
-
-    /**
-     * 分页获取数据
-     *
-     * @param map
-     * @return
-     */
-    List<TfInfoEnterprise> queryPage(Map<String, Object> map);
-
-    /**
-     * 置为不可用
-     *
-     * @param id
-     */
-    void disable(Long id);
-
-    /**
-     * 登陆查询
-     *
-     * @param parameter
-     * @return
-     */
-    TfInfoEnterprise loginQuery(Map<String, Object> parameter);
-}

src/main/java/com/bootdo/data/service/UnitInfoService.java

@@ -1,41 +0,0 @@
-package com.bootdo.data.service;
-
-import java.util.List;
-import java.util.Map;
-
-import com.bootdo.data.domain.UnitApplyInfoDO;
-import com.bootdo.data.domain.UnitInfoDO;
-
-/**
- * 数据处理者名称表
- * 
- * @author admin
- * @email admin@163.com
- * @date 2022-02-28 17:08:50
- */
-public interface UnitInfoService {
-	
-	UnitInfoDO get(Long id);
-	
-	List<UnitInfoDO> list(Map<String, Object> map);
-	
-	int count(Map<String, Object> map);
-	
-	int save(UnitInfoDO unitInfo);
-	
-	int update(UnitInfoDO unitInfo);
-	
-	int remove(Long id);
-	
-	int batchRemove(Long[] ids);
-
-	List<UnitApplyInfoDO> listQuery(Map<String, Object> map);
-
-	int countQuery(Map<String, Object> map);
-
-    List<UnitApplyInfoDO> listEditInfo(Map<String, Object> map);
-
-	int askRemove(Long id);
-
-	int askBatchRemove(Long[] ids);
-}

src/main/java/com/bootdo/data/service/impl/CaDetailServiceImpl.java

@@ -1,76 +0,0 @@
-package com.bootdo.data.service.impl;
-
-import com.bootdo.data.service.CaDetailService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-import com.bootdo.data.domain.CaDetail;
-
-import java.util.List;
-
-import com.bootdo.data.dao.CaDetailMapper;
-import com.bootdo.data.domain.CaDetailExample;
-
-@Service
-public class CaDetailServiceImpl implements CaDetailService {
-
-    @Resource
-    private CaDetailMapper caDetailMapper;
-
-    @Override
-    public long countByExample(CaDetailExample example) {
-        return caDetailMapper.countByExample(example);
-    }
-
-    @Override
-    public int deleteByExample(CaDetailExample example) {
-        return caDetailMapper.deleteByExample(example);
-    }
-
-    @Override
-    public int deleteByPrimaryKey(Integer id) {
-        return caDetailMapper.deleteByPrimaryKey(id);
-    }
-
-    @Override
-    public int insert(CaDetail record) {
-        return caDetailMapper.insert(record);
-    }
-
-    @Override
-    public int insertSelective(CaDetail record) {
-        return caDetailMapper.insertSelective(record);
-    }
-
-    @Override
-    public List<CaDetail> selectByExample(CaDetailExample example) {
-        return caDetailMapper.selectByExample(example);
-    }
-
-    @Override
-    public CaDetail selectByPrimaryKey(Integer id) {
-        return caDetailMapper.selectByPrimaryKey(id);
-    }
-
-    @Override
-    public int updateByExampleSelective(CaDetail record, CaDetailExample example) {
-        return caDetailMapper.updateByExampleSelective(record, example);
-    }
-
-    @Override
-    public int updateByExample(CaDetail record, CaDetailExample example) {
-        return caDetailMapper.updateByExample(record, example);
-    }
-
-    @Override
-    public int updateByPrimaryKeySelective(CaDetail record) {
-        return caDetailMapper.updateByPrimaryKeySelective(record);
-    }
-
-    @Override
-    public int updateByPrimaryKey(CaDetail record) {
-        return caDetailMapper.updateByPrimaryKey(record);
-    }
-
-}

src/main/java/com/bootdo/data/service/impl/CaInfoServiceImpl.java

@@ -1,175 +0,0 @@
-package com.bootdo.data.service.impl;
-
-import com.bootdo.common.utils.Query;
-import com.bootdo.data.domain.CaDetail;
-import com.bootdo.data.service.CaDetailService;
-import com.bootdo.data.service.TfInfoEnterpriseService;
-import com.bootdo.data.util.ApplyCertUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-import com.bootdo.data.domain.CaInfo;
-import com.bootdo.data.domain.CaInfoExample;
-import com.bootdo.data.dao.CaInfoMapper;
-import com.bootdo.data.service.CaInfoService;
-
-@Service
-public class CaInfoServiceImpl implements CaInfoService {
-
-    private static Logger log = LoggerFactory.getLogger(CaInfoServiceImpl.class);
-
-    /**
-     * 证书生成 返回结果状态码
-     */
-    private static final String RESULT_CODE_SUCCESS = "000000";
-
-
-    @Resource
-    private CaInfoMapper caInfoMapper;
-
-    @Resource
-    private CaDetailService caDetailService;
-
-    @Resource
-    ApplyCertUtils applyCertUtils;
-
-    /**
-     * 服务对象
-     */
-    @Resource
-    private TfInfoEnterpriseService tfInfoEnterpriseService;
-
-
-    @Override
-    public long countByExample(CaInfoExample example) {
-        return caInfoMapper.countByExample(example);
-    }
-
-    @Override
-    public int deleteByExample(CaInfoExample example) {
-        return caInfoMapper.deleteByExample(example);
-    }
-
-    @Override
-    public int deleteByPrimaryKey(Integer id) {
-        return caInfoMapper.deleteByPrimaryKey(id);
-    }
-
-    @Override
-    public int insert(CaInfo record) {
-        return caInfoMapper.insert(record);
-    }
-
-    @Override
-    public int insertSelective(CaInfo record) {
-        return caInfoMapper.insertSelective(record);
-    }
-
-    @Override
-    public List<CaInfo> selectByExample(CaInfoExample example) {
-        return caInfoMapper.selectByExample(example);
-    }
-
-    @Override
-    public CaInfo selectByPrimaryKey(Integer id) {
-        return caInfoMapper.selectByPrimaryKey(id);
-    }
-
-    @Override
-    public int updateByExampleSelective(CaInfo record, CaInfoExample example) {
-        return caInfoMapper.updateByExampleSelective(record, example);
-    }
-
-    @Override
-    public int updateByExample(CaInfo record, CaInfoExample example) {
-        return caInfoMapper.updateByExample(record, example);
-    }
-
-    @Override
-    public int updateByPrimaryKeySelective(CaInfo record) {
-        return caInfoMapper.updateByPrimaryKeySelective(record);
-    }
-
-    @Override
-    public int updateByPrimaryKey(CaInfo record) {
-        return caInfoMapper.updateByPrimaryKey(record);
-    }
-
-    @Override
-    public List<CaInfo> queryPage(Query query) {
-        return caInfoMapper.queryPage(query);
-    }
-
-    @Override
-    public int queryPageCount(Query query) {
-        return caInfoMapper.queryPageCount(query);
-    }
-
-    @Override
-    public CaInfo queryById(Integer id) {
-        return this.selectByPrimaryKey(id);
-    }
-
-    @Override
-    public void caStatusUpdate(Integer id, Integer caStatus) throws Exception {
-        CaInfo caInfo = this.selectByPrimaryKey(id);
-
-        // 审核通过时 需要生成证书
-        if (caStatus == CaInfo.CA_STATUS_PASS) {
-            generateCertificateAndRecording(caInfo);
-        }
-
-        // 更新企业证书状态
-        caInfo.setCaStatus(caStatus);
-        caInfo.setUpdateTime(new Date());
-        updateByPrimaryKey(caInfo);
-    }
-
-    @Override
-    public CaInfo getEnterpriseCaByCompanyNameAndUniformSocialCreditCode(String companyName, String uniformSocialCreditCode) {
-        return caInfoMapper.getByCompanyNameAndUniformSocialCreditCode(companyName, uniformSocialCreditCode);
-    }
-
-    /**
-     * 获取增加后的年份
-     *
-     * @param date
-     * @return
-     */
-    private Date getYearAfterAddition(Date date) {
-        Calendar rightNowDate = Calendar.getInstance();
-        rightNowDate.setTime(date);
-        rightNowDate.add(Calendar.YEAR, 1);
-        return rightNowDate.getTime();
-    }
-
-    /**
-     * 生成证书 并记录 证书详情
-     *
-     * @param caInfo 证书详情
-     * @return 签名证书 Base64 编码字符串
-     */
-    private void generateCertificateAndRecording(CaInfo caInfo) throws Exception {
-        // 调用第三方ca证书生成
-        CaDetail caDetail = applyCertUtils.applyCertByCsr(caInfo);
-        // 记录 证书详情 入库
-        caDetailService.insertSelective(caDetail);
-        // 更新 企业ca 证书文件路径
-        caInfo.setFilePath(caDetail.getRemark());
-        caInfo.setCaDetailId(caDetail.getId());
-        // 设置证书 生效开始时间
-        Date date = new Date();
-        caInfo.setEffectiveTimeBeige(date);
-        // 证书失效时间 这里默认为一年有效期 根据情况后可以修改
-        caInfo.setEffectiveTimeEnd(getYearAfterAddition(date));
-    }
-}

src/main/java/com/bootdo/data/service/impl/DataApplyServiceImpl.java

@@ -1,162 +0,0 @@
-package com.bootdo.data.service.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.bootdo.data.dao.DataApplyDao;
-import com.bootdo.data.dao.DataRelationDao;
-import com.bootdo.data.domain.DataApplyDO;
-import com.bootdo.data.domain.DataInfoDO;
-import com.bootdo.data.domain.DataRelationDO;
-import com.bootdo.data.service.DataApplyService;
-import com.bootdo.data.service.DataInfoService;
-
-@Service
-public class DataApplyServiceImpl implements DataApplyService {
-
-    private static Logger log = LoggerFactory.getLogger(DataApplyServiceImpl.class);
-
-    @Autowired
-    private DataApplyDao dataApplyDao;
-
-    @Autowired
-    private DataRelationDao dataRelationDao;
-
-    @Autowired
-    private DataInfoService dataInfoService;
-
-    @Override
-    public DataApplyDO get(Long id) {
-        return dataApplyDao.get(id);
-    }
-
-    @Override
-    public List<DataApplyDO> list(Map<String, Object> map) {
-        return dataApplyDao.list(map);
-    }
-
-    @Override
-    public int count(Map<String, Object> map) {
-        return dataApplyDao.count(map);
-    }
-
-    @Override
-    public int save(DataApplyDO dataApply) {
-        // 存储备案表
-        int count = dataApplyDao.save(dataApply);
-        // 选择的数据ID 数组
-        List<Long> dataIds = dataApply.getDataIds();
-        // 备案ID
-        Long applyId = dataApply.getId();
-        // 存储备案数据关系表 list
-        List<DataRelationDO> drLsit = new ArrayList<>();
-        // 数据表 list
-        List<DataInfoDO> diLsit = new ArrayList<>();
-        // 遍历
-        for (Long dataId : dataIds) {
-            // 存储备案 数据关系表
-            DataRelationDO dataRelationDO = new DataRelationDO();
-            dataRelationDO.setDataId(dataId);
-            dataRelationDO.setApplyId(applyId);
-            drLsit.add(dataRelationDO);
-            // 数据表
-            DataInfoDO dataInfoDO = new DataInfoDO();
-            dataInfoDO.setId(dataId);
-            dataInfoDO.setDataStatus("2");// 审核中
-            diLsit.add(dataInfoDO);
-        }
-        // 存储备案 数据关系表 处理
-        dataRelationDao.removeByApplyId(applyId);
-        if (drLsit.size() > 0) {
-            dataRelationDao.batchSave(drLsit);
-        }
-        // 数据表状态变更 审核中 处理
-        if (diLsit.size() > 0) {
-            for (DataInfoDO dataInfoDO : diLsit) {
-                dataInfoService.update(dataInfoDO);
-            }
-        }
-        return count;
-    }
-
-    @Override
-    public int update(DataApplyDO dataApply) {
-        int count = dataApplyDao.update(dataApply);
-        // 最新选择的数据ID 数组
-        List<Long> dataIds = dataApply.getDataIds();
-        // 变更前的数据ID 数组 变更前
-        List<Long> dataIdInfos = dataApply.getDataIdInfos();
-        // 备案ID 唯一
-        Long applyId = dataApply.getId();
-        log.info("applyId:" + applyId);
-
-        // 存储备案数据关系表 list
-        List<DataRelationDO> drLsit = new ArrayList<>();
-        // 变更前的数据ID list
-        List<DataInfoDO> oldDiLsit = new ArrayList<>();
-
-        // 新选择的数据ID list
-        List<DataInfoDO> newDiLsit = new ArrayList<>();
-
-        // 变更前的数据ID遍历
-        for (Long dataId : dataIdInfos) {
-            // 数据表
-            DataInfoDO dataInfoDO = new DataInfoDO();
-            dataInfoDO.setId(dataId);
-            dataInfoDO.setDataStatus("0");// 正常数据
-            oldDiLsit.add(dataInfoDO);
-        }
-
-        // 最新数据 遍历
-        for (Long dataId : dataIds) {
-            // 存储备案 数据关系表
-            DataRelationDO dataRelationDO = new DataRelationDO();
-            dataRelationDO.setDataId(dataId);
-            dataRelationDO.setApplyId(applyId);
-            drLsit.add(dataRelationDO);
-            // 数据表
-            DataInfoDO dataInfoDO = new DataInfoDO();
-            dataInfoDO.setId(dataId);
-            dataInfoDO.setDataStatus("2");// 审核中数据
-            newDiLsit.add(dataInfoDO);
-        }
-        // 存储备案 数据关系表 处理
-        dataRelationDao.removeByApplyId(applyId);
-        if (drLsit.size() > 0) {
-            dataRelationDao.batchSave(drLsit);
-        }
-        // 变更前的数据ID遍历 恢复正常状态 处理
-        if (oldDiLsit.size() > 0) {
-            log.info("变更前的数据ID个数:" + oldDiLsit.size());
-            for (DataInfoDO dataInfoDO : oldDiLsit) {
-                dataInfoService.update(dataInfoDO);
-            }
-        }
-
-        // 新选择的数据ID 审核中状态 处理
-        if (newDiLsit.size() > 0) {
-            log.info("新选择的数据ID个数:" + newDiLsit.size());
-            for (DataInfoDO dataInfoDO : newDiLsit) {
-                dataInfoService.update(dataInfoDO);
-            }
-        }
-        return count;
-    }
-
-    @Override
-    public int remove(Long id) {
-        return dataApplyDao.remove(id);
-    }
-
-    @Override
-    public int batchRemove(Long[] ids) {
-        return dataApplyDao.batchRemove(ids);
-    }
-
-}

src/main/java/com/bootdo/data/service/impl/DataApprovalServiceImpl.java

@@ -1,157 +0,0 @@
-package com.bootdo.data.service.impl;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.bootdo.common.service.DictService;
-import com.bootdo.common.utils.ShiroUtils;
-import com.bootdo.data.dao.DataApprovalDao;
-import com.bootdo.data.dao.DataInfoDao;
-import com.bootdo.data.dao.DataRelationDao;
-import com.bootdo.data.domain.DataApprovalDO;
-import com.bootdo.data.domain.DataInfoDO;
-import com.bootdo.data.domain.DataRelationDO;
-import com.bootdo.data.domain.UnitApplyInfoDO;
-import com.bootdo.data.service.DataApprovalService;
-import com.bootdo.system.domain.UserDO;
-
-@Service
-public class DataApprovalServiceImpl implements DataApprovalService {
-
-    private static Logger log = LoggerFactory.getLogger(DataApprovalServiceImpl.class);
-
-    @Autowired
-    private DataRelationDao dataRelationDao;
-
-    @Autowired
-    private DictService dictService;
-
-    @Autowired
-    private DataInfoDao dataInfoDao;
-
-    @Autowired
-    private DataApprovalDao dataApprovalDao;
-
-    @Override
-    public DataApprovalDO get(Long id) {
-        return dataApprovalDao.get(id);
-    }
-
-    @Override
-    public List<UnitApplyInfoDO> list(Map<String, Object> map) {
-        List<UnitApplyInfoDO> list = dataApprovalDao.list(map);
-        for (UnitApplyInfoDO unitApplyInfoDO : list) {
-            unitApplyInfoDO.setDataIndustry(dictService.getName("data_industry", unitApplyInfoDO.getDataIndustry()));
-        }
-        return list;
-    }
-
-    @Override
-    public List<UnitApplyInfoDO> viewList(Map<String, Object> map) {
-        List<UnitApplyInfoDO> list = dataApprovalDao.list(map);
-        return list;
-    }
-
-    @Override
-    public int count(Map<String, Object> map) {
-        return dataApprovalDao.count(map);
-    }
-
-    @Override
-    public int verifyInfo(DataApprovalDO dataApproval) {
-        // 备案ID
-        long applyId = dataApproval.getApplyId();
-        // 审批表写入
-        // 先删除
-        dataApprovalDao.removeByApplyId(applyId);
-        // 在写入
-        int count = dataApprovalDao.save(dataApproval);
-        // 数据表状态更新
-        // dataApproval.getStatus() 审批状态 0:通过 1:驳回 3:取消
-        // 数据状态 0:正常 1:删除 2:已上报 3:通过审核 4:驳回
-        log.info("ApprovalStatus:" + dataApproval.getApprovalStatus());
-        if (dataApproval.getApprovalStatus().equals("0")) {
-            updateDataStatus(applyId, "3");// 已审核
-        } else if (dataApproval.getApprovalStatus().equals("1")) {
-            updateDataStatus(applyId, "4");// 驳回
-        } else if (dataApproval.getApprovalStatus().equals("3")) {
-            updateDataStatus(applyId, "2");// 取消 恢复数据上报状态
-        }
-        return count;
-    }
-
-    @Override
-    public int update(DataApprovalDO dataApproval) {
-        return dataApprovalDao.update(dataApproval);
-    }
-
-    @Override
-    public int remove(Long id) {
-        return dataApprovalDao.remove(id);
-    }
-
-    @Override
-    public int batchRemove(Long[] ids) {
-        return dataApprovalDao.batchRemove(ids);
-    }
-
-    @Override
-    public boolean approval(Long applyId, String status, String desc) {
-        // 获取备案相关信息
-        Map<String, Object> params = new HashMap<>();
-        params.put("applyId", applyId);
-        List<UnitApplyInfoDO> list = dataApprovalDao.list(params);
-        UnitApplyInfoDO unitApplyInfoDO = null;
-        if (list != null && list.size() > 0) {
-            // 获取信息
-            unitApplyInfoDO = list.get(0);
-            log.info("unitApplyInfoDO:" + unitApplyInfoDO.getId());
-            UserDO currUser = ShiroUtils.getUser();
-            log.info("currUser:" + currUser.toString());
-            DataApprovalDO dataApproval = new DataApprovalDO();
-            dataApproval.setApplyId(unitApplyInfoDO.getId());// 备案主键ID
-            dataApproval.setApprovalStatus(status);// dataApproval.getStatus() 审批状态 0:通过 1:驳回 3:取消
-            dataApproval.setApprovalDesc(desc);
-            if (null == currUser) {
-                dataApproval.setApprovalUserid("-1");
-                dataApproval.setApprovalUser("获取用户信息为空");
-            } else {
-                dataApproval.setApprovalUserid(String.valueOf(ShiroUtils.getUserId()));
-                dataApproval.setApprovalUser(ShiroUtils.getUser().getUsername());
-            }
-            log.info("dataApproval:" + dataApproval.toString());
-            // 审核成功
-            if (verifyInfo(dataApproval) > 0) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @Description: 修改数据状态
-     * @Author: wangp
-     * @Date: 2022/3/2 0:49
-     * @param id
-     * @Return: void
-     */
-    private void updateDataStatus(Long id, String status) {
-        Map<String, Object> map = new HashMap<>();
-        map.put("applyId", id);
-        List<DataRelationDO> list = dataRelationDao.list(map);
-        for (DataRelationDO dataRelationDO : list) {
-            DataInfoDO dataInfo = new DataInfoDO();
-            dataInfo.setDataStatus(status);// 数据状态 0:正常 1:删除 2:已上报 3:通过审核 4:驳回
-            dataInfo.setId(dataRelationDO.getDataId());
-            // 更新状态
-            dataInfoDao.update(dataInfo);
-        }
-    }
-
-}

src/main/java/com/bootdo/data/service/impl/DataInfoServiceImpl.java

@@ -1,97 +0,0 @@
-package com.bootdo.data.service.impl;
-
-import com.bootdo.common.service.DictService;
-import com.bootdo.common.utils.StringUtils;
-import com.bootdo.data.domain.DataPartDO;
-import com.bootdo.data.service.DataPartService;
-import com.bootdo.oa.domain.NotifyDO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-import com.bootdo.data.dao.DataInfoDao;
-import com.bootdo.data.domain.DataInfoDO;
-import com.bootdo.data.service.DataInfoService;
-
-@Service
-public class DataInfoServiceImpl implements DataInfoService {
-    @Autowired
-    private DataInfoDao dataInfoDao;
-
-    @Autowired
-    private DictService dictService;
-
-    @Autowired
-    private DataPartService dataPartService;
-
-    @Override
-    public DataInfoDO get(Long id) {
-        DataInfoDO dataInfoDO = dataInfoDao.get(id);
-        //dataInfoDO.setDataType(dictService.getName("data_type", dataInfoDO.getDataType()));
-        return dataInfoDO;
-    }
-
-    @Override
-    public List<DataInfoDO> list(Map<String, Object> map) {
-        List<DataInfoDO> lsit = dataInfoDao.list(map);
-        // 遍历词典
-        for (DataInfoDO dataInfoDO : lsit) {
-            //数据类型
-            if(StringUtils.isNotBlank(dataInfoDO.getDataType()) && !dataInfoDO.getDataType().equals("other")){
-                DataPartDO dataPartDO = dataPartService.get(Long.valueOf(dataInfoDO.getDataType()));
-                dataInfoDO.setDataType(dataPartDO.getPartName());
-            }else{
-                dataInfoDO.setDataType("其它");
-            }
-            //数据类型子类
-            if(StringUtils.isNotBlank(dataInfoDO.getDataSub())){
-                DataPartDO dataPartDOs = dataPartService.get(Long.valueOf(dataInfoDO.getDataSub()));
-                dataInfoDO.setDataSub(dataPartDOs.getPartName());
-            }else{
-                dataInfoDO.setDataSub("");
-            }
-
-        }
-        return lsit;
-    }
-
-    @Override
-    public int count(Map<String, Object> map) {
-        return dataInfoDao.count(map);
-    }
-
-    @Override
-    public int save(DataInfoDO dataInfo) {
-        return dataInfoDao.save(dataInfo);
-    }
-
-    @Override
-    public int update(DataInfoDO dataInfo) {
-        return dataInfoDao.update(dataInfo);
-    }
-
-    @Override
-    public int remove(Long id) {
-        return dataInfoDao.remove(id);
-    }
-
-    @Override
-    public int batchRemove(Long[] ids) {
-        return dataInfoDao.batchRemove(ids);
-    }
-
-    /**
-     * @Description:重要数据和核心数据目录备案清单 初始化
-     * @Author: wangp
-     * @Date: 2022/3/1 19:05
-     * @param params
-     * @Return: List<DataInfoDO>
-     */
-    @Override
-    public List<DataInfoDO> querylistInfo(Map<String, Object> params) {
-        return dataInfoDao.querylistInfo(params);
-    }
-
-}

src/main/java/com/bootdo/data/service/impl/DataPartServiceImpl.java

@@ -1,76 +0,0 @@
-package com.bootdo.data.service.impl;
-
-import com.bootdo.data.dao.DataPartDao;
-import com.bootdo.data.domain.DataPartDO;
-import com.bootdo.data.service.DataPartService;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-
-@Service
-public class DataPartServiceImpl implements DataPartService {
-	@Autowired
-	private DataPartDao dataPartDao;
-	
-	@Override
-	public DataPartDO get(Long partId){
-		return dataPartDao.get(partId);
-	}
-	
-	@Override
-	public List<DataPartDO> list(Map<String, Object> map){
-		return dataPartDao.list(map);
-	}
-	
-	@Override
-	public int count(Map<String, Object> map){
-		return dataPartDao.count(map);
-	}
-	
-	@Override
-	public int save(DataPartDO dataPart){
-		return dataPartDao.save(dataPart);
-	}
-
-	@Override
-	public int update(DataPartDO dataPart) {
-		return dataPartDao.update(dataPart);
-	}
-
-	@Override
-	public int remove(Long partId) {
-		// 递归删除
-		recursion(partId);
-		return dataPartDao.remove(partId);
-	}
-
-	/**
-	 * 遍历删除父类的子集 子集的子集等
-	 *
-	 * @param partId
-	 */
-	private void recursion(Long partId) {
-		Map<String, Object> map = new HashMap<>(3);
-		map.put("parentId", partId);
-		List<DataPartDO> list = list(map);
-		List<Long> collect = list.stream().map(DataPartDO::getPartId).collect(Collectors.toList());
-		if (CollectionUtils.isNotEmpty(collect)) {
-			this.batchRemove(collect.toArray(new Long[collect.size()]));
-			for (Long aLong : collect) {
-				recursion(aLong);
-			}
-		}
-	}
-	
-	@Override
-	public int batchRemove(Long[] partIds){
-		return dataPartDao.batchRemove(partIds);
-	}
-	
-}

src/main/java/com/bootdo/data/service/impl/DataUploadServiceImpl.java

@@ -1,57 +0,0 @@
-package com.bootdo.data.service.impl;
-
-import java.util.List;
-import java.util.Map;
-
-import com.bootdo.data.dao.DataUploadDao;
-import com.bootdo.data.domain.DataUploadDO;
-import com.bootdo.data.service.DataUploadService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * @Description: 重要数据
- * @Author: wangp
- * @Date: 2022/2/27 14:49
- */
-@Service
-public class DataUploadServiceImpl implements DataUploadService {
-	@Autowired
-	private DataUploadDao dataUploadDao;
-	
-	@Override
-	public DataUploadDO get(Long id){
-		return dataUploadDao.get(id);
-	}
-	
-	@Override
-	public List<DataUploadDO> list(Map<String, Object> map){
-		return dataUploadDao.list(map);
-	}
-	
-	@Override
-	public int count(Map<String, Object> map){
-		return dataUploadDao.count(map);
-	}
-	
-	@Override
-	public int save(DataUploadDO dataUpload){
-		return dataUploadDao.save(dataUpload);
-	}
-	
-	@Override
-	public int update(DataUploadDO dataUpload){
-		return dataUploadDao.update(dataUpload);
-	}
-	
-	@Override
-	public int remove(Long id){
-		return dataUploadDao.remove(id);
-	}
-	
-	@Override
-	public int batchRemove(Long[] ids){
-		return dataUploadDao.batchRemove(ids);
-	}
-	
-}

src/main/java/com/bootdo/data/service/impl/TfInfoEnterpriseServiceImpl.java

@@ -1,110 +0,0 @@
-package com.bootdo.data.service.impl;
-
-import com.bootdo.data.entity.TfInfoEnterprise;
-import com.bootdo.data.dao.TfInfoEnterpriseDao;
-import com.bootdo.data.service.TfInfoEnterpriseService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * 法人表(TfInfoEnterprise)表服务实现类
- *
- * @author makejava
- * @since 2022-05-09 15:51:40
- */
-@Service("tfInfoEnterpriseService")
-public class TfInfoEnterpriseServiceImpl implements TfInfoEnterpriseService {
-    @Resource
-    private TfInfoEnterpriseDao tfInfoEnterpriseDao;
-
-    /**
-     * 通过ID查询单条数据
-     *
-     * @param id 主键
-     * @return 实例对象
-     */
-    @Override
-    public TfInfoEnterprise queryById(Integer id) {
-        return this.tfInfoEnterpriseDao.queryById(id);
-    }
-
-    /**
-     * 查询多条数据
-     *
-     * @param offset 查询起始位置
-     * @param limit  查询条数
-     * @return 对象列表
-     */
-    @Override
-    public List<TfInfoEnterprise> queryAllByLimit(int offset, int limit) {
-        return this.tfInfoEnterpriseDao.queryAllByLimit(offset, limit);
-    }
-
-    /**
-     * 新增数据
-     *
-     * @param tfInfoEnterprise 实例对象
-     * @return 实例对象
-     */
-    @Override
-    public TfInfoEnterprise insert(TfInfoEnterprise tfInfoEnterprise) {
-        this.tfInfoEnterpriseDao.insert(tfInfoEnterprise);
-        return tfInfoEnterprise;
-    }
-
-    /**
-     * 修改数据
-     *
-     * @param tfInfoEnterprise 实例对象
-     * @return 实例对象
-     */
-    @Override
-    public TfInfoEnterprise update(TfInfoEnterprise tfInfoEnterprise) {
-        this.tfInfoEnterpriseDao.update(tfInfoEnterprise);
-        return this.queryById(tfInfoEnterprise.getId());
-    }
-
-    /**
-     * 通过主键删除数据
-     *
-     * @param id 主键
-     * @return 是否成功
-     */
-    @Override
-    public boolean deleteById(Integer id) {
-        return this.tfInfoEnterpriseDao.deleteById(id) > 0;
-    }
-
-    @Override
-    public int queryPageCount(Map<String, Object> map) {
-        return this.tfInfoEnterpriseDao.queryPageCount(map);
-    }
-
-    @Override
-    public List<TfInfoEnterprise> queryPage(Map<String, Object> map) {
-        return this.tfInfoEnterpriseDao.queryPage(map);
-    }
-
-    @Override
-    public void disable(Long id) {
-        TfInfoEnterprise tfInfoEnterprise = this.tfInfoEnterpriseDao.queryById(id.intValue());
-        if (Objects.nonNull(tfInfoEnterprise)) {
-            if (tfInfoEnterprise.getState() == 0) {
-                tfInfoEnterprise.setState(1);
-            } else {
-                tfInfoEnterprise.setState(0);
-            }
-
-            this.tfInfoEnterpriseDao.update(tfInfoEnterprise);
-        }
-    }
-
-    @Override
-    public TfInfoEnterprise loginQuery(Map<String, Object> parameter) {
-        return this.tfInfoEnterpriseDao.loginQuery(parameter);
-    }
-}

src/main/java/com/bootdo/data/service/impl/UnitInfoServiceImpl.java

@@ -1,136 +0,0 @@
-package com.bootdo.data.service.impl;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.bootdo.common.service.DictService;
-import com.bootdo.data.dao.DataApplyDao;
-import com.bootdo.data.dao.DataInfoDao;
-import com.bootdo.data.dao.DataRelationDao;
-import com.bootdo.data.dao.UnitInfoDao;
-import com.bootdo.data.domain.DataInfoDO;
-import com.bootdo.data.domain.DataRelationDO;
-import com.bootdo.data.domain.UnitApplyInfoDO;
-import com.bootdo.data.domain.UnitInfoDO;
-import com.bootdo.data.service.UnitInfoService;
-
-@Service
-public class UnitInfoServiceImpl implements UnitInfoService {
-    @Autowired
-    private UnitInfoDao unitInfoDao;
-
-    @Autowired
-    private DataRelationDao dataRelationDao;
-
-    @Autowired
-    private DataInfoDao dataInfoDao;
-
-    @Autowired
-    private DataApplyDao dataApplyDao;
-
-    @Autowired
-    private DictService dictService;
-
-    @Override
-    public UnitInfoDO get(Long id) {
-        return unitInfoDao.get(id);
-    }
-
-    @Override
-    public List<UnitInfoDO> list(Map<String, Object> map) {
-        return unitInfoDao.list(map);
-    }
-
-    @Override
-    public int count(Map<String, Object> map) {
-        return unitInfoDao.count(map);
-    }
-
-    @Override
-    public int save(UnitInfoDO unitInfo) {
-        return unitInfoDao.save(unitInfo);
-    }
-
-    @Override
-    public int update(UnitInfoDO unitInfo) {
-        return unitInfoDao.update(unitInfo);
-    }
-
-    @Override
-    public int remove(Long id) {
-        return unitInfoDao.remove(id);
-    }
-
-    @Override
-    public int batchRemove(Long[] ids) {
-        return unitInfoDao.batchRemove(ids);
-    }
-
-    @Override
-    public List<UnitApplyInfoDO> listQuery(Map<String, Object> map) {
-        List<UnitApplyInfoDO> list = unitInfoDao.listQuery(map);
-        for (UnitApplyInfoDO unitApplyInfoDO : list) {
-            unitApplyInfoDO.setDataIndustry(dictService.getName("data_industry", unitApplyInfoDO.getDataIndustry()));
-        }
-
-        return list;
-    }
-
-    @Override
-    public int countQuery(Map<String, Object> map) {
-        return unitInfoDao.countQuery(map);
-    }
-
-    @Override
-    public List<UnitApplyInfoDO> listEditInfo(Map<String, Object> map) {
-        return unitInfoDao.listEditInfo(map);
-    }
-
-    @Override
-    public int askRemove(Long id) {
-        // 数据表状态修改为 未上报
-        //先查询
-        updateDataStatus(id);
-        // 删除 数据备案与重要数据关系表
-        dataRelationDao.removeByApplyId(id);
-        // 删除 数据备案表
-        return dataApplyDao.remove(id);
-    }
-
-    @Override
-    public int askBatchRemove(Long[] ids) {
-        // 数据表状态修改为 未上报
-        for (Long id : ids) {
-            updateDataStatus(id);
-        }
-        // 删除 数据备案与重要数据关系表
-        dataRelationDao.batchRemoveByApplyId(ids);
-        // 删除 数据备案表
-        return dataApplyDao.batchRemove(ids);
-    }
-
-    /**
-     * @Description: 修改数据状态
-     * @Author: wangp
-     * @Date: 2022/3/2 0:49
-     * @param id
-     * @Return: void
-     */
-    private void updateDataStatus(Long id) {
-        Map<String,Object> map = new HashMap<>();
-        map.put("applyId",id);
-        List<DataRelationDO> list =dataRelationDao.list(map);
-        for(DataRelationDO dataRelationDO : list){
-            DataInfoDO dataInfo = new DataInfoDO();
-            dataInfo.setDataStatus("0");//未上报 正常
-            dataInfo.setId(dataRelationDO.getDataId());
-            //更新状态
-            dataInfoDao.update(dataInfo);
-        }
-    }
-
-}

src/main/java/com/bootdo/datas/controller/ApiController.java

@@ -1,90 +0,0 @@
-package com.bootdo.datas.controller;
-
-import org.bouncycastle.util.encoders.Hex;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.alibaba.fastjson.JSON;
-import com.bootdo.common.utils.R;
-import com.bootdo.common.utils.StringUtils;
-import com.bootdo.datas.domain.DataDO;
-import com.bootdo.datas.service.DataService;
-import com.bootdo.datas.tools.gm.FileCryptTool;
-import com.bootdo.datas.tools.gm.GmUtils;
-
-/**
- * @date 2022/4/21 15:53
- * @author wangp
- * @description
- */
-@Controller
-@RequestMapping("/api")
-public class ApiController {
-
-    private static Logger log = LoggerFactory.getLogger(ApiController.class);
-
-    @Autowired
-    private GmUtils gmUtils;
-
-
-    @Autowired
-    private DataService dataService;
-
-    /**
-     * @Description: 数据同步接收接口
-     * @Author: wangp
-     * @Date: 2022/4/21 16:03
-     * @param
-     * @Return: R
-     */
-    @ResponseBody
-    @PostMapping("/accessData")
-    public R accessData(@RequestBody String requestBody) {
-        log.info("requestBody:" + requestBody);
-        // 解密
-        if (StringUtils.isBlank(requestBody)) {
-            return R.error(9001, "参数为空");
-        }
-        String value = gmUtils.decrypt(requestBody);
-        // 转body
-        DataDO dataDO = JSON.parseObject(value, DataDO.class);
-        log.info("dataDO:" + dataDO.toString());
-        // 入库  企业 备案数据
-        dataService.datAsync(dataDO);
-        return R.ok();
-    }
-
-    public static void main(String[] args) {
-        // 测试
-        DataDO dataDO = new DataDO();
-        dataDO.setIndustryType("123");
-        dataDO.setUnitProvince("江苏");
-        String result = JSON.toJSONString(dataDO);
-        System.out.println(result);
-        // 加密
-        byte[] sourceData = result.getBytes();
-        byte[] encData = FileCryptTool.encryptData("d:/sm2/sm2_client_enc_cert.crt", sourceData);
-        String encValue = "";
-        if (encData != null) {
-            encValue = Hex.toHexString(encData);
-            System.out.println("encValue:" + encValue);
-        }
-        // 解密
-        byte[] decData = FileCryptTool.decryptData("d:/sm2/sm2_client_enc_private.key", Hex.decode(encValue));
-        String decValue = "";
-        if (decData != null) {
-            decValue = new String(decData);
-            System.out.println("decValue:" + decValue);
-        }
-        DataDO dataDO1 = JSON.parseObject(decValue, DataDO.class);
-        System.out
-            .println("IndustryType为:" + dataDO1.getIndustryType() + "，UnitProvince为：" + dataDO1.getUnitProvince());
-    }
-
-}

src/main/java/com/bootdo/datas/controller/DashboardController.java

@@ -2,11 +2,14 @@ package com.bootdo.datas.controller;
 
 import com.bootdo.common.utils.PageUtils;
 import com.bootdo.common.utils.Query;
-import com.bootdo.datas.domain.DataDO;
+
+import com.bootdo.common.utils.StringUtils;
 import com.bootdo.datas.dto.*;
 import com.bootdo.datas.service.DataService;
 import com.bootdo.datas.service.GyDataService;
+import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,6 +35,8 @@ public class DashboardController {
     @Autowired
     private DataService dataService;
 
+    @Value("${deployType:#{null}}")
+    public String deployType;
 
     /**
      * 首页地图数据
@@ -42,8 +47,14 @@ public class DashboardController {
     @GetMapping("/queryData")
     public MapDataResultDTO queryData() {
         MapDataResultDTO mapDataResultDTO = new MapDataResultDTO();
-        List<MapDataDTO> mapData1 = dataService.mapDataList("重要数据");
-        List<MapDataDTO> mapData2 = dataService.mapDataList("核心数据");
+        String auditStage = null;
+        if("1".equals(deployType)){ //市级单独部署
+            auditStage = "1";
+        } else {
+            auditStage = "2";
+        }
+        List<MapDataDTO> mapData1 = dataService.mapDataList("重要数据",auditStage);
+        List<MapDataDTO> mapData2 = dataService.mapDataList("核心数据",auditStage);
 
         if (!CollectionUtils.isEmpty(mapData1) && !CollectionUtils.isEmpty(mapData2)) {
             mapDataResultDTO.setMapData1(mapData1);
@@ -79,6 +90,11 @@ public class DashboardController {
     public PageUtils list(@RequestParam Map<String, Object> params) {
         // 查询列表数据
         Query query = new Query(params);
+        String dataStatus = (String) params.get("dataStatus");
+        if(StringUtils.isNotEmpty(dataStatus)) {
+            query.put("dataStatusArrs", Lists.newArrayList((dataStatus)));
+        }
+        query.put("neqDataStatus", "4");
         List<GyDataImportDTO> dataList = gyDataService.list(query);
         int total = gyDataService.countTotal(query);
         PageUtils pageUtils = new PageUtils(dataList, total);

src/main/java/com/bootdo/datas/controller/DataController.java

@@ -2,23 +2,21 @@ package com.bootdo.datas.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.bootdo.common.annotation.Log;
-import com.bootdo.common.utils.PageUtils;
-import com.bootdo.common.utils.Query;
-import com.bootdo.common.utils.R;
-import com.bootdo.common.utils.StringUtils;
-import com.bootdo.datas.domain.DataDO;
+import com.bootdo.common.utils.*;
 import com.bootdo.datas.domain.GbDataExcelDO;
 import com.bootdo.datas.domain.GyDataExcelDO;
 import com.bootdo.datas.dto.GyDataImportDTO;
 import com.bootdo.datas.service.DataService;
 import com.bootdo.datas.service.GyDataService;
 import com.bootdo.datas.tools.ExcelUtils;
+import com.google.common.collect.Lists;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -26,7 +24,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
+
 
 /**
  * 重要数据表
@@ -42,8 +40,6 @@ public class DataController {
 
     private static Logger log = LoggerFactory.getLogger(DataController.class);
 
-    @Autowired
-    private DataService dataService;
 
     @Autowired
     private GyDataService gyDataService;
@@ -74,6 +70,11 @@ public class DataController {
     public PageUtils list(@RequestParam Map<String, Object> params) {
         // 查询列表数据
         Query query = new Query(params);
+        String dataStatus = (String) params.get("dataStatus");
+        if(StringUtils.isNotEmpty(dataStatus)) {
+            query.put("dataStatusArrs", Lists.newArrayList((dataStatus)));
+        }
+
         List<GyDataImportDTO> dataList = gyDataService.list(query);
         int total = gyDataService.countTotal(query);
         PageUtils pageUtils = new PageUtils(dataList, total);
@@ -114,24 +115,31 @@ public class DataController {
     @PostMapping("/save")
     @RequiresPermissions("datas:data:add")
     public R save(@RequestParam("data_file") MultipartFile file) {
-        String fileName = file.getOriginalFilename();
-        log.info("fileName:" + fileName);
-        String type = fileName.substring(fileName.lastIndexOf(".") + 1);
-        // 根据excel类型取数据
-        if ("xlsx".equals(type) || "xlsx".equals(type)) {
-            // dataService.save(file);
-            // 文件解密
-            String decFlg = gyDataService.dec(file);
-            log.info("decFlg:" + decFlg);
-            if (StringUtils.isNotBlank(decFlg)) {
-                gyDataService.save(decFlg,2);
+        try {
+            String fileName = file.getOriginalFilename();
+            log.info("fileName:" + fileName);
+            String type = fileName.substring(fileName.lastIndexOf(".") + 1);
+            // 根据excel类型取数据
+            if ("xlsx".equals(type) || "xlsx".equals(type)) {
+                // dataService.save(file);
+                // 文件解密
+                String decFlg = gyDataService.dec(file);
+                log.info("decFlg:" + decFlg);
+                if (StringUtils.isNotBlank(decFlg)) {
+                    String reault = gyDataService.cipherTextImport(decFlg, 2);
+                    if (!ObjectUtils.isEmpty(reault)) {
+                        return R.ok(fileName + ":" + reault);
+                    }
+                } else {
+                    return R.error("文件解密异常！");
+                }
             } else {
-                return R.error("文件解密异常！");
+                return R.error("请使用excel导入！");
             }
-        } else {
-            return R.error("请使用excel导入！");
+            return R.ok();
+        } catch (BDException e){
+            return R.error(e.getMessage());
         }
-        return R.ok();
     }
 
     /**
@@ -345,9 +353,9 @@ public class DataController {
             data = gyDataService.get(id);
             log.info("status:" + data.getDataStatus());
             if ("2".equals(data.getDataStatus())) {
-                // 0:待审核 1:删除 2:已上报 3:通过审核 4:驳回 5:联合审批 6:终审
+                // 0:待审核 1:删除 2:已上报 3:通过审核 4:驳回
                 data.setId(id);
-                data.setDataStatus("5");
+                data.setSendVerify("3");
                 data.setNextVerifyDept(deptId);
                 gyDataService.updateStatus(data);
             }
@@ -380,19 +388,23 @@ public class DataController {
     @PostMapping("/plainTextImport")
     @RequiresPermissions("datas:data:plainTextImport")
     public R plainTextImport(@RequestParam("data_file") MultipartFile file) {
-        String fileName = file.getOriginalFilename();
-        log.info("fileName:" + fileName);
-        String type = fileName.substring(fileName.lastIndexOf(".") + 1);
-        // 根据excel类型取数据
-        if ("xlsx".equals(type) || "xlsx".equals(type)) {
-             String decFlg = gyDataService.plainTextImport(file,2);
-            if (StringUtils.isNotBlank(decFlg)) {
-                return R.error("文件导入异常！");
+        try {
+            String fileName = file.getOriginalFilename();
+            log.info("fileName:" + fileName);
+            String type = fileName.substring(fileName.lastIndexOf(".") + 1);
+            // 根据excel类型取数据
+            if ("xlsx".equals(type) || "xlsx".equals(type)) {
+                String reault = gyDataService.plainTextImport(file, 2);
+                if (!ObjectUtils.isEmpty(reault)) {
+                    return R.ok(fileName + ":" + reault);
+                }
+            } else {
+                return R.error("请使用excel导入！");
             }
-        } else {
-            return R.error("请使用excel导入！");
+            return R.ok();
+        } catch (BDException e){
+            return R.error(e.getMessage());
         }
-        return R.ok();
     }
 
 }

src/main/java/com/bootdo/datas/controller/DataExpertController.java

@@ -5,7 +5,8 @@ import com.bootdo.common.annotation.Log;
 import com.bootdo.common.utils.PageUtils;
 import com.bootdo.common.utils.Query;
 import com.bootdo.common.utils.R;
-import com.bootdo.data.domain.ExpertOpinionDO;
+import com.bootdo.common.utils.StringUtils;
+import com.bootdo.datas.domain.ExpertOpinionDO;
 import com.bootdo.datas.domain.GyDataExcelDO;
 import com.bootdo.datas.dto.ExamineLogDTO;
 import com.bootdo.datas.dto.GyDataImportDTO;
@@ -13,6 +14,7 @@ import com.bootdo.datas.service.DataService;
 import com.bootdo.datas.service.ExamineLogService;
 import com.bootdo.datas.service.GyDataService;
 import com.bootdo.datas.tools.ExcelUtils;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
@@ -63,6 +65,12 @@ public class DataExpertController {
     public PageUtils list(@RequestParam Map<String, Object> params) {
         // 查询列表数据
         Query query = new Query(params);
+        String dataStatus = (String) params.get("dataStatus");
+        if(StringUtils.isNotEmpty(dataStatus)) {
+            query.put("dataStatusArrs", Lists.newArrayList((dataStatus)));
+        }
+        query.put("sendVerify", "2");
+        query.put("neqDataStatus", "4");
         List<GyDataImportDTO> dataList = gyDataService.list(query);
         int total = gyDataService.countTotal(query);
         PageUtils pageUtils = new PageUtils(dataList, total);

src/main/java/com/bootdo/datas/controller/DataRecoverController.java

@@ -4,10 +4,10 @@ import com.bootdo.common.annotation.Log;
 import com.bootdo.common.utils.PageUtils;
 import com.bootdo.common.utils.Query;
 import com.bootdo.common.utils.R;
-import com.bootdo.datas.domain.DataDO;
+import com.bootdo.common.utils.StringUtils;
 import com.bootdo.datas.dto.GyDataImportDTO;
-import com.bootdo.datas.service.DataService;
 import com.bootdo.datas.service.GyDataService;
+import com.google.common.collect.Lists;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -48,6 +48,10 @@ public class DataRecoverController {
     public PageUtils list(@RequestParam Map<String, Object> params) {
         // 查询列表数据
         Query query = new Query(params);
+        String dataStatus = (String) params.get("dataStatus");
+        if(StringUtils.isNotEmpty(dataStatus)) {
+            query.put("dataStatusArrs", Lists.newArrayList((dataStatus)));
+        }
         List<GyDataImportDTO> dataList = gyDataService.listRecover(query);
         int total = gyDataService.countRecover(query);
         return new PageUtils(dataList, total);

src/main/java/com/bootdo/datas/controller/DataUnionController.java

@@ -2,10 +2,7 @@ package com.bootdo.datas.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.bootdo.common.annotation.Log;
-import com.bootdo.common.utils.PageUtils;
-import com.bootdo.common.utils.Query;
-import com.bootdo.common.utils.R;
-import com.bootdo.datas.domain.DataDO;
+import com.bootdo.common.utils.*;
 import com.bootdo.datas.domain.GyDataExcelDO;
 import com.bootdo.datas.dto.ExamineLogDTO;
 import com.bootdo.datas.dto.GyDataImportDTO;
@@ -13,11 +10,14 @@ import com.bootdo.datas.service.DataService;
 import com.bootdo.datas.service.ExamineLogService;
 import com.bootdo.datas.service.GyDataService;
 import com.bootdo.datas.tools.ExcelUtils;
+import com.bootdo.system.domain.UserDO;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.util.CollectionUtils;
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
+
 
 /**
  * 重要数据表
@@ -43,8 +43,9 @@ public class DataUnionController {
 
     private static Logger log = LoggerFactory.getLogger(DataUnionController.class);
 
-    @Autowired
-    private DataService dataService;
+    @Value("${managerValue}")
+    public String managerValue;
+
     @Autowired
     private GyDataService gyDataService;
     @Autowired
@@ -70,10 +71,20 @@ public class DataUnionController {
     @GetMapping("/list")
     @RequiresPermissions("datas:unionVerify:data")
     public PageUtils list(@RequestParam Map<String, Object> params) {
+        UserDO currUser = ShiroUtils.getUser();
         // 查询列表数据
         Query query = new Query(params);
-        List<GyDataImportDTO> dataList = gyDataService.listUnion(query);
-        int total = gyDataService.countUnion(query);
+        if (!managerValue.contains(currUser.getDeptId().toString())) {
+            query.put("nextVerifyDept", String.valueOf(currUser.getDeptId()));
+        }
+        String dataStatus = (String) params.get("dataStatus");
+        if(StringUtils.isNotEmpty(dataStatus)) {
+            query.put("dataStatusArrs", Lists.newArrayList((dataStatus)));
+        }
+        query.put("sendVerify", "3");
+        query.put("neqDataStatus", "4");
+        List<GyDataImportDTO> dataList = gyDataService.list(query);
+        int total = gyDataService.countTotal(query);
         PageUtils pageUtils = new PageUtils(dataList, total);
         return pageUtils;
     }

src/main/java/com/bootdo/datas/controller/DataVerifyController.java

@@ -2,9 +2,7 @@ package com.bootdo.datas.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.bootdo.common.annotation.Log;
-import com.bootdo.common.utils.PageUtils;
-import com.bootdo.common.utils.Query;
-import com.bootdo.common.utils.R;
+import com.bootdo.common.utils.*;
 import com.bootdo.datas.domain.GyDataExcelDO;
 import com.bootdo.datas.dto.ExamineLogDTO;
 import com.bootdo.datas.dto.GyDataImportDTO;
@@ -12,11 +10,15 @@ import com.bootdo.datas.service.DataService;
 import com.bootdo.datas.service.ExamineLogService;
 import com.bootdo.datas.service.GyDataService;
 import com.bootdo.datas.tools.ExcelUtils;
+import com.bootdo.system.domain.UserDO;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import org.apache.commons.lang.ObjectUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.util.CollectionUtils;
@@ -38,8 +40,9 @@ public class DataVerifyController {
 
     private static Logger log = LoggerFactory.getLogger(DataVerifyController.class);
 
-    @Autowired
-    private DataService dataService;
+    @Value("${managerValue}")
+    public String managerValue;
+
     @Autowired
     private GyDataService gyDataService;
     @Autowired
@@ -65,10 +68,25 @@ public class DataVerifyController {
     @GetMapping("/list")
     @RequiresPermissions("datas:dataVerify:data")
     public PageUtils list(@RequestParam Map<String, Object> params) {
+        UserDO currUser = ShiroUtils.getUser();
         // 查询列表数据
         Query query = new Query(params);
-        List<GyDataImportDTO> dataList = gyDataService.examineList(query);
-        int total = gyDataService.countExamineTotal(query);
+        if (!managerValue.contains(currUser.getDeptId().toString())) {
+            if (currUser.getExamineRoleId() != null) {
+                query.put("roleId", String.valueOf(currUser.getExamineRoleId()));
+            } else { //不是管理员部门且也不是审核员类型角色的不允许看
+                query.put("roleId", "-1");
+            }
+        }
+        String dataStatus = (String) params.get("dataStatus");
+        if(StringUtils.isNotEmpty(dataStatus)) {
+            query.put("dataStatusArrs", Lists.newArrayList((dataStatus)));
+        } else {
+            query.put("dataStatusArrs", Lists.newArrayList(2,3,4));
+        }
+
+        List<GyDataImportDTO> dataList = gyDataService.list(query);
+        int total = gyDataService.countTotal(query);
         PageUtils pageUtils = new PageUtils(dataList, total);
         return pageUtils;
     }
@@ -152,6 +170,7 @@ public class DataVerifyController {
         // 0:正常 1:删除 2:已上报 3:通过审核 4:驳回
         data.setId(id);
         data.setDataStatus("4");
+        data.setAuditStage("1");
         gyDataService.updateStatus(data);
         return R.ok();
     }

src/main/java/com/bootdo/datas/controller/ExamineLogController.java

@@ -1,30 +1,19 @@
 package com.bootdo.datas.controller;
 
-import com.alibaba.fastjson.JSONArray;
-import com.bootdo.common.annotation.Log;
+
 import com.bootdo.common.utils.PageUtils;
 import com.bootdo.common.utils.Query;
-import com.bootdo.common.utils.R;
-import com.bootdo.common.utils.StringUtils;
-import com.bootdo.datas.domain.GbDataExcelDO;
-import com.bootdo.datas.domain.GyDataExcelDO;
+
 import com.bootdo.datas.dto.ExamineLogDTO;
-import com.bootdo.datas.dto.GyDataImportDTO;
-import com.bootdo.datas.service.DataService;
+
 import com.bootdo.datas.service.ExamineLogService;
-import com.bootdo.datas.service.GyDataService;
-import com.bootdo.datas.tools.ExcelUtils;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/bootdo/datas/controller/GyDataImportController.java

@@ -2,22 +2,20 @@ package com.bootdo.datas.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.bootdo.common.annotation.Log;
-import com.bootdo.common.utils.PageUtils;
-import com.bootdo.common.utils.Query;
-import com.bootdo.common.utils.R;
-import com.bootdo.common.utils.StringUtils;
+import com.bootdo.common.utils.*;
 import com.bootdo.datas.domain.GyDataExcelDO;
 import com.bootdo.datas.dto.GyDataImportDTO;
-import com.bootdo.datas.service.DataService;
 import com.bootdo.datas.service.GyDataService;
 import com.bootdo.datas.tools.ExcelUtils;
 import com.bootdo.datas.tools.gm.FileCryptTool;
+import com.google.common.collect.Lists;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -34,8 +32,6 @@ public class GyDataImportController {
 
     @Autowired
     private GyDataService gyDataService;
-    @Autowired
-    private DataService dataService;
 
     @GetMapping()
     @Log("访问数据导入")
@@ -59,6 +55,11 @@ public class GyDataImportController {
     public PageUtils list(@RequestParam Map<String, Object> params) {
         // 查询列表数据
         Query query = new Query(params);
+        String dataStatus = (String) params.get("dataStatus");
+        if(StringUtils.isNotEmpty(dataStatus)) {
+            query.put("dataStatusArrs", Lists.newArrayList((dataStatus)));
+        }
+        query.put("neqDataStatus", "4");
         List<GyDataImportDTO> dataList = gyDataService.list(query);
         int total = gyDataService.countTotal(query);
         PageUtils pageUtils = new PageUtils(dataList, total);
@@ -95,31 +96,35 @@ public class GyDataImportController {
     @PostMapping("/save")
     @RequiresPermissions("datas:gyDataImport:add")
     public R save(@RequestParam("data_file") MultipartFile file) {
-        String fileName = file.getOriginalFilename();
-        log.info("fileName:" + fileName);
-        String type = fileName.substring(fileName.lastIndexOf(".") + 1);
-        // 根据excel类型取数据
-        if ("xlsx".equals(type) || "xlsx".equals(type)) {
-            // 文件解密
-            String decFlg = gyDataService.dec(file);
-            log.info("decFlg:" + decFlg);
-            if (StringUtils.isNotBlank(decFlg)) {
-                try {
-                    int otherProvinceCount = gyDataService.save(decFlg,1);
-                    if (otherProvinceCount > 0) {
-                        return R.ok(fileName + ", " + otherProvinceCount + "条非本省数据!<br/>");
+        try {
+            String fileName = file.getOriginalFilename();
+            log.info("fileName:" + fileName);
+            String type = fileName.substring(fileName.lastIndexOf(".") + 1);
+            // 根据excel类型取数据
+            if ("xlsx".equals(type) || "xlsx".equals(type)) {
+                // 文件解密
+                String decFlg = gyDataService.dec(file);
+                log.info("decFlg:" + decFlg);
+                if (StringUtils.isNotBlank(decFlg)) {
+                    try {
+                        String reault = gyDataService.cipherTextImport(decFlg, 1);
+                        if (!ObjectUtils.isEmpty(reault)) {
+                            return R.ok(fileName + ":" + reault);
+                        }
+                    } catch (Exception e) {
+                        log.info("Exception:", e);
+                        return R.error("文件异常！");
                     }
-                } catch (Exception e) {
-                    log.info("Exception:", e);
-                    return R.error("文件异常！");
+                } else {
+                    return R.error("文件解密异常！");
                 }
             } else {
-                return R.error("文件解密异常！");
+                return R.error("请使用excel导入！");
             }
-        } else {
-            return R.error("请使用excel导入！");
+            return R.ok("0");
+        } catch (BDException e){
+            return R.error(e.getMessage());
         }
-        return R.ok("0");
     }
 
     /**
@@ -230,19 +235,24 @@ public class GyDataImportController {
     @PostMapping("/plainTextImport")
     @RequiresPermissions("datas:gyDataImport:plainTextImport")
     public R plainTextImport(@RequestParam("data_file") MultipartFile file) {
-        String fileName = file.getOriginalFilename();
-        log.info("fileName:" + fileName);
-        String type = fileName.substring(fileName.lastIndexOf(".") + 1);
-        // 根据excel类型取数据
-        if ("xlsx".equals(type) || "xlsx".equals(type)) {
-            String decFlg = gyDataService.plainTextImport(file,1);
-            if (StringUtils.isNotBlank(decFlg)) {
-                return R.error("文件导入异常！");
+        try {
+            String fileName = file.getOriginalFilename();
+            log.info("fileName:" + fileName);
+            String type = fileName.substring(fileName.lastIndexOf(".") + 1);
+            // 根据excel类型取数据
+            if ("xlsx".equals(type) || "xlsx".equals(type)) {
+                String reault = gyDataService.plainTextImport(file, 1);
+                if (!ObjectUtils.isEmpty(reault)) {
+                    return R.ok(fileName + ":" + reault);
+                }
+
+            } else {
+                return R.error("请使用excel导入！");
             }
-        } else {
-            return R.error("请使用excel导入！");
+            return R.ok();
+        } catch (BDException e){
+            return R.error(e.getMessage());
         }
-        return R.ok();
     }
 
     public static void main(String[] args) {

src/main/java/com/bootdo/datas/controller/UnitController.java

@@ -4,11 +4,11 @@ import com.bootdo.common.annotation.Log;
 import com.bootdo.common.utils.PageUtils;
 import com.bootdo.common.utils.Query;
 import com.bootdo.common.utils.R;
-import com.bootdo.datas.domain.GyDataDO;
+
 import com.bootdo.datas.domain.GyUnitDO;
 import com.bootdo.datas.domain.UnitDO;
 import com.bootdo.datas.dto.GyDataImportDTO;
-import com.bootdo.datas.service.GyDataService;
+
 import com.bootdo.datas.service.UnitService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +16,6 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -98,16 +97,6 @@ public class UnitController {
         return R.error();
     }
 
-    /**
-     * 修改
-     */
-    @ResponseBody
-    @RequestMapping("/update")
-    @RequiresPermissions("datas:unit:edit")
-    public R update(UnitDO unit) {
-        unitService.update(unit);
-        return R.ok();
-    }
 
     /**
      * 删除

src/main/java/com/bootdo/datas/dao/DataDao.java

@@ -1,6 +1,6 @@
 package com.bootdo.datas.dao;
 
-import com.bootdo.datas.domain.DataDO;
+
 import com.bootdo.datas.dto.DateAndCountDTO;
 import com.bootdo.datas.dto.MapDataDTO;
 import com.bootdo.datas.dto.NameAndValueDTO;
@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
+
 
 /**
  * 重要数据表
@@ -25,79 +25,49 @@ public interface DataDao {
 	 *
 	 * @return
 	 */
-	List<MapDataDTO> mapDataList(@Param("dataLevel") String dataLevel);
+	List<MapDataDTO> mapDataList(@Param("dataLevel") String dataLevel,@Param("auditStage") String auditStage);
 
 	/**
 	 * 上报数据趋势统计
 	 *
 	 * @return
 	 */
-    List<DateAndCountDTO> trendData(@Param("provinceName") String provinceName);
+    List<DateAndCountDTO> trendData(@Param("city") String city,@Param("auditStage") String auditStage);
 
     /**
      * 所属行业子类统计
      *
-     * @param provinceName
+     * @param city
      * @return
      */
-    List<NameAndValueDTO> IndustryData(@Param("provinceName") String provinceName);
+    List<NameAndValueDTO> industryData(@Param("city") String city,@Param("auditStage") String auditStage);
 
-    /**
-     * 行业类别 统计
-     *
-     * @param provinceName
-     * @return
-     */
-    List<NameAndValueDTO> industryTypeData(@Param("provinceName") String provinceName);
 
     /**
      * 数据级别 统计
      *
-     * @param provinceName
+     * @param city
      * @param dataLevel
      * @return
      */
-    List<DateAndCountDTO> dataLevelData(@Param("provinceName") String provinceName,
-                                        @Param("dataLevel") String dataLevel);
+    List<DateAndCountDTO> dataLevelData(@Param("city") String city,
+                                        @Param("dataLevel") String dataLevel,
+										@Param("auditStage") String auditStage);
 
 	/**
 	 * 计算审核通过率
 	 *
-	 * @param provinceName
+	 * @param city
 	 * @return
 	 */
-	Double dataAuditData(@Param("provinceName") String provinceName);
+	Double dataAuditData(@Param("city") String city,@Param("auditStage") String auditStage);
 
 	/**
 	 * 统计数据所属分类
 	 *
 	 * @return
 	 */
-	List<NameAndValueDTO> dataCategoryData(@Param("provinceName") String provinceName);
+	List<NameAndValueDTO> dataCategoryData(@Param("city") String city);
 
 
-    /**
-     * 根据do条件获取数据集合
-     *
-     * @param dataDO
-     * @return
-     */
-    List<DataDO> getByCondition(DataDO dataDO);
-
-    /**
-     * 根据条件获取 备案 审批通过数据
-     *
-     * @param parameter
-     * @return
-     */
-    List<DataDO> portalDataList(Map<String, Object> parameter);
-
-    /**
-     * 根据条件获取 备案 审批通过数据 总数量
-     *
-     * @param parameter
-     * @return
-     */
-    Long portalDataListCount(Map<String, Object> parameter);
-
 }

src/main/java/com/bootdo/datas/dao/GyDataDao.java

@@ -12,11 +12,10 @@ import java.util.Map;
 @Mapper
 public interface GyDataDao {
 
-    int count(Map<String, Object> map);
 
     List<GyDataImportDTO> list(Map<String, Object> map);
 
-    List<GyDataImportDTO> examineList(Map<String, Object> map);
+    int countTotal(Map<String, Object> map);
 
     List<GyDataImportDTO> listId(Map<String, Object> map);
 
@@ -34,19 +33,15 @@ public interface GyDataDao {
 
     int updateStatus(GyDataImportDTO data);
 
-    int countTotal(Map<String, Object> map);
-
     List<GyDataImportDTO> listRecover(Map<String, Object> map);
 
     int countRecover(Map<String, Object> map);
 
-    int recover(Long id);
+    int recover(Long id,String auditStage);
 
     void remove(Long id);
 
     int batchPhysicalDeletion(Long[] ids);
 
-    GyDataDO getGyDataDO(GyDataDO gyDataDO);
-
     GyDataImportDTO getRecoverUnit(Long id);
 }

src/main/java/com/bootdo/datas/dao/UnitDao.java

@@ -28,16 +28,11 @@ public interface UnitDao {
 
     int save(UnitDO unit);
 
-    int update(UnitDO unit);
 
     int remove(Long ID);
 
     int batchRemove(Long[] ids);
 
-    UnitDO getUnit(UnitDO unitDO);
-
-    List<UnitDO> query(UnitDO unitDO);
-
     GyUnitDO getUnitById(Long id);
 
     int updateUnitByCreditCode(String creditCode);

src/main/java/com/bootdo/datas/domain/DataDO.java

@@ -1,496 +0,0 @@
-package com.bootdo.datas.domain;
-
-import java.io.Serializable;
-import java.util.Date;
-
-
-
-/**
- * 重要数据表
- * 
- * @author admin
- * @email admin@163.com
- * @date 2022-03-06 14:03:25
- */
-public class DataDO implements Serializable {
-	private static final long serialVersionUID = 1L;
-	
-	//
-	private Long id;
-	//数据来源
-	private String dataSource;
-	//数据名称
-	private String dataName;
-	//数据级别:01终验数据 02 核心数据
-	private String dataLevel;
-	//数据类别
-	private String dataType;
-	//数组子类
-	private String dataSub;
-	//二级子类
-	private String dataAdjSub;
-	//数据规模
-	private String dataScope;
-	//数据目的
-	private String dataResult;
-	//数据存储位置
-	private String dataLocation;
-	//数据范围
-	private String dataRange;
-	//负责人(管理部门或责任人)
-	private String dataRuler;
-	//对外共享(范围 内容)
-	private String shareRange;
-	//跨境传输(范围 内容)
-	private String crossRange;
-	//安全保护措施
-	private String dataSafety;
-	//备注
-	private String dataDesc;
-	//状态 0:正常 1:删除 2:已上报 3:通过审核 4:驳回
-	private String dataStatus;
-	//数据上传者
-	private String uploadUser;
-	//数据上传者ID
-	private String uploadUserid;
-	//上传时间
-	private Date uploadTime;
-	//修改时间
-	private Date updateTime;
-	//联系人
-	private String liaiseMan;
-	//联系方式
-	private String liaiseWay;
-
-	//数据处理者名称
-	private String reporterUnit;
-	//数据处理者名称 省份
-	private String unitProvince;
-	//数据处理者名称 城市
-	private String unitCity;
-	//数据处理者名称 其它信息
-	private String unitOther;
-	//所属行业子类
-	private String dataIndustry;
-
-	/**
-	 * 所属行业: 原材料工业 装备工业 消费品工业 电子信息制造业 软件和信息技术服务业 民爆
-	 */
-	private String industryType;
-
-	// 部门
-	private Long deptId;
-	// 联合审批部门ID
-	private Long nextVerifyDept;
-	// 送审状态
-	private String sendVerify;
-
-	// 管理部门
-	private String dataManager;
-
-	// 数据精度
-	private String dataPrecision;
-
-	/**
-	 * 设置：
-	 */
-	public void setId(Long id) {
-		this.id = id;
-	}
-	/**
-	 * 获取：
-	 */
-	public Long getId() {
-		return id;
-	}
-	/**
-	 * 设置：数据来源
-	 */
-	public void setDataSource(String dataSource) {
-		this.dataSource = dataSource;
-	}
-	/**
-	 * 获取：数据来源
-	 */
-	public String getDataSource() {
-		return dataSource;
-	}
-	/**
-	 * 设置：数据名称
-	 */
-	public void setDataName(String dataName) {
-		this.dataName = dataName;
-	}
-	/**
-	 * 获取：数据名称
-	 */
-	public String getDataName() {
-		return dataName;
-	}
-	/**
-	 * 设置：数据级别:01终验数据 02 核心数据
-	 */
-	public void setDataLevel(String dataLevel) {
-		this.dataLevel = dataLevel;
-	}
-	/**
-	 * 获取：数据级别:01终验数据 02 核心数据
-	 */
-	public String getDataLevel() {
-		return dataLevel;
-	}
-	/**
-	 * 设置：数据类别
-	 */
-	public void setDataType(String dataType) {
-		this.dataType = dataType;
-	}
-	/**
-	 * 获取：数据类别
-	 */
-	public String getDataType() {
-		return dataType;
-	}
-	/**
-	 * 设置：数组子类
-	 */
-	public void setDataSub(String dataSub) {
-		this.dataSub = dataSub;
-	}
-	/**
-	 * 获取：数组子类
-	 */
-	public String getDataSub() {
-		return dataSub;
-	}
-	/**
-	 * 设置：二级子类
-	 */
-	public void setDataAdjSub(String dataAdjSub) {
-		this.dataAdjSub = dataAdjSub;
-	}
-	/**
-	 * 获取：二级子类
-	 */
-	public String getDataAdjSub() {
-		return dataAdjSub;
-	}
-	/**
-	 * 设置：数据规模
-	 */
-	public void setDataScope(String dataScope) {
-		this.dataScope = dataScope;
-	}
-	/**
-	 * 获取：数据规模
-	 */
-	public String getDataScope() {
-		return dataScope;
-	}
-	/**
-	 * 设置：数据目的
-	 */
-	public void setDataResult(String dataResult) {
-		this.dataResult = dataResult;
-	}
-	/**
-	 * 获取：数据目的
-	 */
-	public String getDataResult() {
-		return dataResult;
-	}
-	/**
-	 * 设置：数据存储位置
-	 */
-	public void setDataLocation(String dataLocation) {
-		this.dataLocation = dataLocation;
-	}
-	/**
-	 * 获取：数据存储位置
-	 */
-	public String getDataLocation() {
-		return dataLocation;
-	}
-	/**
-	 * 设置：数据范围
-	 */
-	public void setDataRange(String dataRange) {
-		this.dataRange = dataRange;
-	}
-	/**
-	 * 获取：数据范围
-	 */
-	public String getDataRange() {
-		return dataRange;
-	}
-	/**
-	 * 设置：负责人(管理部门或责任人)
-	 */
-	public void setDataRuler(String dataRuler) {
-		this.dataRuler = dataRuler;
-	}
-	/**
-	 * 获取：负责人(管理部门或责任人)
-	 */
-	public String getDataRuler() {
-		return dataRuler;
-	}
-	/**
-	 * 设置：对外共享(范围 内容)
-	 */
-	public void setShareRange(String shareRange) {
-		this.shareRange = shareRange;
-	}
-	/**
-	 * 获取：对外共享(范围 内容)
-	 */
-	public String getShareRange() {
-		return shareRange;
-	}
-	/**
-	 * 设置：跨境传输(范围 内容)
-	 */
-	public void setCrossRange(String crossRange) {
-		this.crossRange = crossRange;
-	}
-	/**
-	 * 获取：跨境传输(范围 内容)
-	 */
-	public String getCrossRange() {
-		return crossRange;
-	}
-	/**
-	 * 设置：安全保护措施
-	 */
-	public void setDataSafety(String dataSafety) {
-		this.dataSafety = dataSafety;
-	}
-	/**
-	 * 获取：安全保护措施
-	 */
-	public String getDataSafety() {
-		return dataSafety;
-	}
-	/**
-	 * 设置：备注
-	 */
-	public void setDataDesc(String dataDesc) {
-		this.dataDesc = dataDesc;
-	}
-	/**
-	 * 获取：备注
-	 */
-	public String getDataDesc() {
-		return dataDesc;
-	}
-	/**
-	 * 设置：状态 0:正常 1:删除 2:已上报 3:通过审核 4:驳回
-	 */
-	public void setDataStatus(String dataStatus) {
-		this.dataStatus = dataStatus;
-	}
-	/**
-	 * 获取：状态 0:正常 1:删除 2:已上报 3:通过审核 4:驳回
-	 */
-	public String getDataStatus() {
-		return dataStatus;
-	}
-	/**
-	 * 设置：数据上传者
-	 */
-	public void setUploadUser(String uploadUser) {
-		this.uploadUser = uploadUser;
-	}
-	/**
-	 * 获取：数据上传者
-	 */
-	public String getUploadUser() {
-		return uploadUser;
-	}
-	/**
-	 * 设置：数据上传者ID
-	 */
-	public void setUploadUserid(String uploadUserid) {
-		this.uploadUserid = uploadUserid;
-	}
-	/**
-	 * 获取：数据上传者ID
-	 */
-	public String getUploadUserid() {
-		return uploadUserid;
-	}
-	/**
-	 * 设置：上传时间
-	 */
-	public void setUploadTime(Date uploadTime) {
-		this.uploadTime = uploadTime;
-	}
-	/**
-	 * 获取：上传时间
-	 */
-	public Date getUploadTime() {
-		return uploadTime;
-	}
-	/**
-	 * 设置：修改时间
-	 */
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-	/**
-	 * 获取：修改时间
-	 */
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-	/**
-	 * 设置：联系人
-	 */
-	public void setLiaiseMan(String liaiseMan) {
-		this.liaiseMan = liaiseMan;
-	}
-	/**
-	 * 获取：联系人
-	 */
-	public String getLiaiseMan() {
-		return liaiseMan;
-	}
-	/**
-	 * 设置：联系方式
-	 */
-	public void setLiaiseWay(String liaiseWay) {
-		this.liaiseWay = liaiseWay;
-	}
-	/**
-	 * 获取：联系方式
-	 */
-	public String getLiaiseWay() {
-		return liaiseWay;
-	}
-
-	public String getReporterUnit() {
-        return reporterUnit;
-	}
-
-	public void setReporterUnit(String reporterUnit) {
-		this.reporterUnit = reporterUnit;
-	}
-
-	public String getUnitProvince() {
-		return unitProvince;
-	}
-
-	public void setUnitProvince(String unitProvince) {
-		this.unitProvince = unitProvince;
-	}
-
-	public String getDataIndustry() {
-		return dataIndustry;
-	}
-
-	public void setDataIndustry(String dataIndustry) {
-		this.dataIndustry = dataIndustry;
-	}
-
-	public String getUnitCity() {
-		return unitCity;
-	}
-
-	public void setUnitCity(String unitCity) {
-		this.unitCity = unitCity;
-	}
-
-	public String getUnitOther() {
-		return unitOther;
-	}
-
-	public void setUnitOther(String unitOther) {
-		this.unitOther = unitOther;
-	}
-
-	public Long getDeptId() {
-		return deptId;
-	}
-
-	public void setDeptId(Long deptId) {
-		this.deptId = deptId;
-	}
-
-	public Long getNextVerifyDept() {
-		return nextVerifyDept;
-	}
-
-	public void setNextVerifyDept(Long nextVerifyDept) {
-		this.nextVerifyDept = nextVerifyDept;
-	}
-
-	public String getSendVerify() {
-		return sendVerify;
-	}
-
-	public void setSendVerify(String sendVerify) {
-		this.sendVerify = sendVerify;
-	}
-
-	public String getIndustryType() {
-		return industryType;
-	}
-
-	public void setIndustryType(String industryType) {
-		this.industryType = industryType;
-	}
-
-	public String getDataManager() {
-		return dataManager;
-	}
-
-	public void setDataManager(String dataManager) {
-		this.dataManager = dataManager;
-	}
-
-	public String getDataPrecision() {
-		return dataPrecision;
-	}
-
-	public void setDataPrecision(String dataPrecision) {
-		this.dataPrecision = dataPrecision;
-	}
-
-	@Override
-	public String toString() {
-		return "DataDO{" +
-				"id=" + id +
-				", dataSource='" + dataSource + '\'' +
-				", dataName='" + dataName + '\'' +
-				", dataLevel='" + dataLevel + '\'' +
-				", dataType='" + dataType + '\'' +
-				", dataSub='" + dataSub + '\'' +
-				", dataAdjSub='" + dataAdjSub + '\'' +
-				", dataScope='" + dataScope + '\'' +
-				", dataResult='" + dataResult + '\'' +
-				", dataLocation='" + dataLocation + '\'' +
-				", dataRange='" + dataRange + '\'' +
-				", dataRuler='" + dataRuler + '\'' +
-				", shareRange='" + shareRange + '\'' +
-				", crossRange='" + crossRange + '\'' +
-				", dataSafety='" + dataSafety + '\'' +
-				", dataDesc='" + dataDesc + '\'' +
-				", dataStatus='" + dataStatus + '\'' +
-				", uploadUser='" + uploadUser + '\'' +
-				", uploadUserid='" + uploadUserid + '\'' +
-				", uploadTime=" + uploadTime +
-				", updateTime=" + updateTime +
-				", liaiseMan='" + liaiseMan + '\'' +
-				", liaiseWay='" + liaiseWay + '\'' +
-				", reporterUnit='" + reporterUnit + '\'' +
-				", unitProvince='" + unitProvince + '\'' +
-				", unitCity='" + unitCity + '\'' +
-				", unitOther='" + unitOther + '\'' +
-				", dataIndustry='" + dataIndustry + '\'' +
-				", industryType='" + industryType + '\'' +
-				", deptId=" + deptId +
-				", nextVerifyDept=" + nextVerifyDept +
-				", sendVerify='" + sendVerify + '\'' +
-				'}';
-	}
-}

src/main/java/com/bootdo/datas/domain/GyDataDO.java

@@ -1,6 +1,6 @@
 package com.bootdo.datas.domain;
 
-import io.swagger.models.auth.In;
+
 
 import java.io.Serializable;
 import java.util.Date;
@@ -285,6 +285,11 @@ public class GyDataDO implements Serializable {
      */
     private Long nextVerifyDept;
 
+    /**
+     * 审核阶段, 1市级，2省级
+     */
+    private String auditStage;
+
     /**
      * 送审状态:默认未送审 0 已送审：1 专家审核：2
      */
@@ -305,6 +310,14 @@ public class GyDataDO implements Serializable {
      */
     private Long roleId;
 
+    public String getAuditStage() {
+        return auditStage;
+    }
+
+    public void setAuditStage(String auditStage) {
+        this.auditStage = auditStage;
+    }
+
     public Long getId() {
         return id;
     }

src/main/java/com/bootdo/datas/dto/GyDataImportDTO.java

@@ -380,6 +380,19 @@ public class GyDataImportDTO {
      */
     private String dataDesc;
 
+    /**
+     * 审核阶段, 1市级，2省级
+     */
+    private String auditStage;
+
+    public String getAuditStage() {
+        return auditStage;
+    }
+
+    public void setAuditStage(String auditStage) {
+        this.auditStage = auditStage;
+    }
+
     public Long getId() {
         return id;
     }

src/main/java/com/bootdo/datas/dto/MapDataDTO.java

@@ -10,15 +10,15 @@ import lombok.Data;
  **/
 @Data
 public class MapDataDTO {
-    private String provinceName;
+    private String cityName;
     private Long amount;
 
-    public String getProvinceName() {
-        return provinceName;
+    public String getCityName() {
+        return cityName;
     }
 
-    public void setProvinceName(String provinceName) {
-        this.provinceName = provinceName;
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
     }
 
     public Long getAmount() {

src/main/java/com/bootdo/datas/service/DataService.java

@@ -1,11 +1,11 @@
 package com.bootdo.datas.service;
 
-import com.bootdo.datas.domain.DataDO;
+
 import com.bootdo.datas.dto.DateAndCountDTO;
 import com.bootdo.datas.dto.DateAndCountListDTO;
 import com.bootdo.datas.dto.MapDataDTO;
 import com.bootdo.datas.dto.NameAndValueDTO;
-import org.springframework.web.multipart.MultipartFile;
+
 
 import java.util.List;
 import java.util.Map;
@@ -24,7 +24,7 @@ public interface DataService {
 	 *
 	 * @return
 	 */
-	List<MapDataDTO> mapDataList(String dataLevel);
+	List<MapDataDTO> mapDataList(String dataLevel,String auditStage);
 
 	/**
 	 * 上报趋势图
@@ -69,28 +69,5 @@ public interface DataService {
     List<NameAndValueDTO> dataCategoryData();
 
 
-    /**
-     * 根据条件获取 备案 审批通过数据
-     *
-     * @param parameter
-     * @return
-     */
-    List<DataDO> portalDataList(Map<String, Object> parameter);
 
-    /**
-     * 根据条件获取 备案 审批通过数据 总数量
-     *
-     * @param parameter
-     * @return
-     */
-    Long portalDataListCount(Map<String, Object> parameter);
-
-    /**
-     * @param dataDO
-     * @Description: 备案信息同步
-     * @Author: wangp
-     * @Date: 2022/4/22 15:54
-     * @Return: void
-     */
-    void datAsync(DataDO dataDO);
 }

src/main/java/com/bootdo/datas/service/GyDataService.java

@@ -1,6 +1,6 @@
 package com.bootdo.datas.service;
 
-import com.bootdo.data.domain.ExpertOpinionDO;
+import com.bootdo.datas.domain.ExpertOpinionDO;
 import com.bootdo.datas.domain.GbDataExcelDO;
 import com.bootdo.datas.domain.GyDataExcelDO;
 import com.bootdo.datas.dto.GyDataImportDTO;
@@ -14,9 +14,11 @@ public interface GyDataService {
 
     List<GyDataImportDTO> list(Map<String, Object> map);
 
-    List<GyDataImportDTO> examineList(Map<String, Object> map);
+    int countTotal(Map<String, Object> map);
+
+    String cipherTextImport(String decFlg,int type);
 
-    int save(String decFlg,int type);
+    String plainTextImport(MultipartFile file,int type);
 
     GyDataImportDTO get(Long id);
 
@@ -30,17 +32,8 @@ public interface GyDataService {
 
     void addExpertOpinion(ExpertOpinionDO expertOpinionDO);
 
-    int countTotal(Map<String, Object> map);
-
-    int countExamineTotal(Map<String, Object> map);
-
-    List<GyDataImportDTO> listUnion(Map<String, Object> map);
-
-    int countUnion(Map<String, Object> map);
-
     String dec(MultipartFile file);
 
-    String plainTextImport(MultipartFile file,int type);
 
     List<GyDataImportDTO> listRecover(Map<String, Object> map);
 

src/main/java/com/bootdo/datas/service/UnitService.java

@@ -23,8 +23,7 @@ public interface UnitService {
 	int count(Map<String, Object> map);
 	
 	int save(UnitDO unit);
-	
-	int update(UnitDO unit);
+
 	
 	int remove(Long id);
 

src/main/java/com/bootdo/datas/service/impl/DataServiceImpl.java

@@ -3,8 +3,8 @@ package com.bootdo.datas.service.impl;
 import com.bootdo.common.domain.DictDO;
 import com.bootdo.common.service.DictService;
 import com.bootdo.common.utils.ShiroUtils;
+import com.bootdo.common.utils.StringUtils;
 import com.bootdo.datas.dao.DataDao;
-import com.bootdo.datas.domain.DataDO;
 import com.bootdo.datas.domain.UnitDO;
 import com.bootdo.datas.dto.DateAndCountDTO;
 import com.bootdo.datas.dto.DateAndCountListDTO;
@@ -32,43 +32,57 @@ public class DataServiceImpl implements DataService {
     @Autowired
     private DataDao dataDao;
 
-    @Value("${managerValue}")
-    public String managerValue;
-
     @Autowired
     private DictService dictService;
 
     @Autowired
     private GyDataService gyDataService;
 
+    @Value("${deployType:#{null}}")
+    public String deployType;
+
+    @Value("${sysCity:#{null}}")
+    public String sysCity;
+
     @Override
-    public List<MapDataDTO> mapDataList(String dataLevel) {
-        return dataDao.mapDataList(dataLevel);
+    public List<MapDataDTO> mapDataList(String dataLevel,String auditStage) {
+        return dataDao.mapDataList(dataLevel,auditStage);
     }
 
     @Override
     public List<DateAndCountDTO> trendData() {
         UserDO currUser = ShiroUtils.getUser();
-        String provinceName = null;
-        if (!managerValue.contains(currUser.getDeptId().toString())) {
-            provinceName = currUser.getProvince();
+        String city = currUser.getCity();
+        if(StringUtils.isEmpty(city)){
+            city = sysCity;
         }
-        log.info("method: trendData, user: " + currUser.getUsername() + " provinceName: " + provinceName);
-        return dataDao.trendData(provinceName);
+        String auditStage = null;
+        if("1".equals(deployType)){ //市级单独部署
+            auditStage = "1";
+        } else {
+            auditStage = "2";
+        }
+        log.info("method: trendData, user: " + currUser.getUsername() + " city: " + city);
+        return dataDao.trendData(city, auditStage);
     }
 
     @Override
     public List<NameAndValueDTO> industryData() {
         UserDO currUser = ShiroUtils.getUser();
-        String provinceName = null;
-        if (!managerValue.contains(currUser.getDeptId().toString())) {
-            provinceName = currUser.getProvince();
+        String city = currUser.getCity();
+        if(StringUtils.isEmpty(city)){
+            city = sysCity;
         }
+        String auditStage = null;
+        if("1".equals(deployType)){ //市级单独部署
+            auditStage = "1";
+        } else {
+            auditStage = "2";
+        }
+        List<NameAndValueDTO> dtoList = dataDao.industryData(city,auditStage);
 
-        List<NameAndValueDTO> dtoList = dataDao.IndustryData(provinceName);
-
-        log.info("method: IndustryData, user: " + currUser.getUsername() + " provinceName: " +
-                provinceName + " 数据: " + dtoList);
+        log.info("method: industryData, user: " + currUser.getUsername() + " city: " +
+                city + " 数据: " + dtoList);
 
         // 处理 超过6条时, 将6条以上转为其他中 合并集合
         if (!CollectionUtils.isEmpty(dtoList) && dtoList.size() > 6) {
@@ -79,34 +93,12 @@ public class DataServiceImpl implements DataService {
         return dtoList;
     }
 
-//    @Override
-//    public List<NameAndValueDTO> industryTypeData() {
-//        UserDO currUser = ShiroUtils.getUser();
-//        String provinceName = null;
-//        if (!managerValue.contains(currUser.getDeptId().toString())) {
-//            provinceName = currUser.getProvince();
-//        }
-//
-//        List<NameAndValueDTO> dtoList = dataDao.industryTypeData(provinceName);
-//
-//        log.debug("method: industryTypeData, user: " + currUser.getUsername() + " provinceName: " +
-//                provinceName + " datas: " + dtoList);
-//
-//        // 处理 超过6条时, 将6条以上转为其他中 合并集合
-//        if (!CollectionUtils.isEmpty(dtoList) && dtoList.size() > 6) {
-//            return mergeDataList(dtoList);
-//        }
-//
-//        // 不处理直接返回
-//        return dtoList;
-//    }
-
     @Override
     public List<NameAndValueDTO> industryTypeData() {
         UserDO currUser = ShiroUtils.getUser();
-        String provinceName = null;
-        if (!managerValue.contains(currUser.getDeptId().toString())) {
-            provinceName = currUser.getProvince();
+        String city = currUser.getCity();
+        if(StringUtils.isEmpty(city)){
+            city = sysCity;
         }
         List<NameAndValueDTO> dtoList = new ArrayList<>();
         // 查询列表数据
@@ -117,7 +109,6 @@ public class DataServiceImpl implements DataService {
         for (DictDO dictDO:dictList){
             String value = dictDO.getValue();
             query.put("industryTypeOne",value);
-            query.put("unitProvince",provinceName);
             int total = gyDataService.countTotal(query);
             if (total > 0) {
                 NameAndValueDTO nameAndValueDTO = new NameAndValueDTO();
@@ -127,8 +118,8 @@ public class DataServiceImpl implements DataService {
             }
         }
 
-        log.debug("method: industryTypeData, user: " + currUser.getUsername() + " provinceName: " +
-                provinceName + " datas: " + dtoList);
+        log.debug("method: industryTypeData, user: " + currUser.getUsername() + " city: " +
+                city + " datas: " + dtoList);
 
         // 处理 超过6条时, 将6条以上转为其他中 合并集合
 //        if (!CollectionUtils.isEmpty(dtoList) && dtoList.size() > 6) {
@@ -142,17 +133,22 @@ public class DataServiceImpl implements DataService {
     @Override
     public DateAndCountListDTO dataLevelData() {
         UserDO currUser = ShiroUtils.getUser();
-        String provinceName = null;
-        if (!managerValue.contains(currUser.getDeptId().toString())) {
-            provinceName = currUser.getProvince();
+        String city = currUser.getCity();
+        if(StringUtils.isEmpty(city)){
+            city = sysCity;
+        }
+        String auditStage = null;
+        if("1".equals(deployType)){ //市级单独部署
+            auditStage = "1";
+        } else {
+            auditStage = "2";
         }
 
+        List<DateAndCountDTO> importantData = dataDao.dataLevelData(city, "重要数据",auditStage);
+        List<DateAndCountDTO> coreData = dataDao.dataLevelData(city, "核心数据",auditStage);
 
-        List<DateAndCountDTO> importantData = dataDao.dataLevelData(provinceName, "重要数据");
-        List<DateAndCountDTO> coreData = dataDao.dataLevelData(provinceName, "核心数据");
-
-        log.info("method: dataLevelData, user: " + currUser.getUsername() + " provinceName: " +
-                provinceName + " 核心: " + coreData + " 重要: " + importantData);
+        log.info("method: dataLevelData, user: " + currUser.getUsername() + " city: " +
+                city + " 核心: " + coreData + " 重要: " + importantData);
 
         return new DateAndCountListDTO(importantData, coreData);
     }
@@ -160,38 +156,37 @@ public class DataServiceImpl implements DataService {
     @Override
     public Double dataAuditData() {
         UserDO currUser = ShiroUtils.getUser();
-        String provinceName = null;
-        if (!managerValue.contains(currUser.getDeptId().toString())) {
-            provinceName = currUser.getProvince();
+        String city = currUser.getCity();
+        if(StringUtils.isEmpty(city)){
+            city = sysCity;
         }
-        Double passingRate = dataDao.dataAuditData(provinceName);
-        log.info("method: dataAuditData, user: " + currUser.getUsername() + " provinceName: " +
-                provinceName + " 通过率: " + passingRate);
+        String auditStage = null;
+        if("1".equals(deployType)){ //市级单独部署
+            auditStage = "1";
+        } else {
+            auditStage = "2";
+        }
+        Double passingRate = dataDao.dataAuditData(city,auditStage);
+        log.info("method: dataAuditData, user: " + currUser.getUsername() + " city: " +
+                city + " 通过率: " + passingRate);
         return passingRate;
     }
 
     @Override
     public List<NameAndValueDTO> dataCategoryData() {
         UserDO currUser = ShiroUtils.getUser();
-        String provinceName = null;
-        if (!managerValue.contains(currUser.getDeptId().toString())) {
-            provinceName = currUser.getProvince();
+        String city = currUser.getCity();
+        if(StringUtils.isEmpty(city)){
+            city = sysCity;
         }
-        List<NameAndValueDTO> result = dataDao.dataCategoryData(provinceName);
-        log.info("method: dataCategoryData, user: " + currUser.getUsername() + " provinceName: " +
-                provinceName + " 数据结果: " + result.toString());
+
+        List<NameAndValueDTO> result = dataDao.dataCategoryData(city);
+        log.info("method: dataCategoryData, user: " + currUser.getUsername() + " city: " +
+                city + " 数据结果: " + result.toString());
         return result;
     }
 
-    @Override
-    public List<DataDO> portalDataList(Map<String, Object> parameter) {
-        return dataDao.portalDataList(parameter);
-    }
 
-    @Override
-    public Long portalDataListCount(Map<String, Object> parameter) {
-        return dataDao.portalDataListCount(parameter);
-    }
 
     /**
      * 超过六条 需要合并数据
@@ -233,83 +228,5 @@ public class DataServiceImpl implements DataService {
         return newlist;
     }
 
-    /**
-     * @Description: 遍历excel信息
-     * @Author: wangp
-     * @Date: 2022/3/9 20:56
-     * @param cell
-     * @Return: String
-     */
-    private String getValues(Cell cell) {
-        String value = "";
-        try {
-            if (cell != null) {
-                log.info("CellType" + cell.getCellType());
-                // cell.setCellType(CellType.STRING);
-                value = cell.getStringCellValue();
-            } else {
-                value = "无";
-            }
-        } catch (Exception e) {
-            log.info("String 处理异常");
-            cell.setCellType(CellType.STRING);
-            value = cell.getStringCellValue();
-        }
-        return value;
-    }
-
-
-    /**
-     * @Description: 备案信息同步
-     * @Author: wangp
-     * @Date: 2022/4/22 15:55
-     * @param dataDO
-     * @Return: void
-     */
-    @Override
-    public void datAsync(DataDO dataDO) {
-        // 企业同步
-//        UnitDO unitDO = new UnitDO();
-//        unitDO.setReporterUnit(dataDO.getReporterUnit());// 数据处理者名称
-//        unitDO.setIndustryType(dataDO.getIndustryType());// 所属行业
-//        unitDO.setDataIndustry(dataDO.getDataIndustry());// 所属行业子类
-//        unitDO.setUnitProvince(dataDO.getUnitProvince());// 省份
-//        unitDO.setUnitCity(dataDO.getUnitCity());// 地市
-//        unitDO.setUnitOther(dataDO.getUnitOther());// 地市
-//        unitDO.setUploadUser("api");
-//        unitDO.setUploadUserid("-1");
-//        //查询企业
-//        UnitDO unitDOs = unitDao.getUnit(unitDO);
-//        if (unitDOs == null) {
-//            try {
-//                unitDao.save(unitDO);
-//            } catch (Exception e) {
-//                log.error("error reomve : {}", e.getMessage());
-//            }
-//        }
-//        // 测试
-//        dataDO.setDataName(dataDO.getDataName());
-//        // 备案数据同步
-//        Map<String, Object> params = new HashMap<>();
-//        // 数据名称
-//        params.put("dataName", dataDO.getDataName());
-//        // 单位
-//        params.put("reporterUnit", dataDO.getReporterUnit());
-//        // 数据来源
-//        params.put("dataSource", dataDO.getDataSource());
-//        // 未删除状态的数据
-//        params.put("deleteStatus", "0");
-//        List<DataDO> listInfo = dataDao.queryList(params);
-//
-//        if (listInfo != null && listInfo.size() > 0) {
-//            // 删除数据
-//            log.info("删除数据id：" + listInfo.get(0).getId());
-//            dataDao.remove(listInfo.get(0).getId());
-//        }
-//        dataDO.setSendVerify("1");// 送审状态 0:未送审 1：已送审
-//        // 存储
-//        dataDao.save(dataDO);
-
-    }
 
 }

src/main/java/com/bootdo/datas/service/impl/UnitServiceImpl.java

@@ -4,8 +4,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.bootdo.common.utils.Query;
-import com.bootdo.common.utils.R;
+
+import com.bootdo.common.utils.StringUtils;
 import com.bootdo.datas.domain.GyUnitDO;
 import com.bootdo.datas.dto.GyDataImportDTO;
 import com.bootdo.datas.service.GyDataService;
@@ -30,6 +30,12 @@ public class UnitServiceImpl implements UnitService {
     @Value("${managerValue}")
     public String managerValue;
 
+    @Value("${sysProvince:#{null}}")
+    public String sysProvince;
+
+    @Value("${sysCity:#{null}}")
+    public String sysCity;
+
     @Autowired
     private UnitService unitService;
 
@@ -45,13 +51,18 @@ public class UnitServiceImpl implements UnitService {
     public List<GyUnitDO> list(Map<String, Object> map) {
         UserDO currUser = ShiroUtils.getUser();
         log.info("currUser:" + currUser.toString());
+        String province = currUser.getProvince();
+        if(StringUtils.isEmpty(province)){
+            province = sysProvince;
+        }
+        String city = currUser.getCity();
+        if(StringUtils.isEmpty(city)){
+            city = sysCity;
+        }
+
         if (!managerValue.contains(currUser.getDeptId().toString())) {
-            log.info("地方主管部门");
-            map.put("deptId", String.valueOf(currUser.getDeptId()));
-            map.put("nextVerifyDept", String.valueOf(currUser.getDeptId()));
-            map.put("unitProvince", String.valueOf(currUser.getProvince()));
-        } else {
-            log.info("工信部 管理员");
+            map.put("unitProvince", province);
+            map.put("unitCity", city);
         }
         return unitDao.list(map);
     }
@@ -59,14 +70,18 @@ public class UnitServiceImpl implements UnitService {
     @Override
     public int count(Map<String, Object> map) {
         UserDO currUser = ShiroUtils.getUser();
-        log.info("currUser:" + currUser.toString());
+        String province = currUser.getProvince();
+        if(StringUtils.isEmpty(province)){
+            province = sysProvince;
+        }
+        String city = currUser.getCity();
+        if(StringUtils.isEmpty(city)){
+            city = sysCity;
+        }
+
         if (!managerValue.contains(currUser.getDeptId().toString())) {
-            log.info("地方主管部门");
-            map.put("deptId", String.valueOf(currUser.getDeptId()));
-            map.put("nextVerifyDept", String.valueOf(currUser.getDeptId()));
-            map.put("unitProvince", String.valueOf(currUser.getProvince()));
-        } else {
-            log.info("工信部 管理员");
+            map.put("unitProvince", province);
+            map.put("unitCity", city);
         }
         return unitDao.count(map);
     }
@@ -76,10 +91,7 @@ public class UnitServiceImpl implements UnitService {
         return unitDao.save(unit);
     }
 
-    @Override
-    public int update(UnitDO unit) {
-        return unitDao.update(unit);
-    }
+
 
     @Override
     public int remove(Long id) {

src/main/java/com/bootdo/oa/config/WebSocketConfig.java

@@ -1,51 +0,0 @@
-package com.bootdo.oa.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.messaging.simp.config.MessageBrokerRegistry;
-import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer;
-import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
-import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
-
-/**
- * 通过EnableWebSocketMessageBroker 开启使用STOMP协议来传输基于代理(message broker)的消息,此时浏览器支持使用@MessageMapping 就像支持@RequestMapping一样。
- */
-@Configuration
-@EnableWebSocketMessageBroker
-public class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer {
-
-    //    /**
-//     * endPoint 注册协议节点,并映射指定的URl
-//     *
-//     * @param registry
-//     */
-//    @Override
-//    public void registerStompEndpoints(StompEndpointRegistry registry) {
-//        //注册一个Stomp 协议的endpoint,并指定 SockJS协议。
-//        registry.addEndpoint("/endpointWisely").withSockJS();
-//    }
-//
-//    /**
-//     * 配置消息代理(message broker)
-//     *
-//     * @param registry
-//     */
-//    @Override
-//    public void configureMessageBroker(MessageBrokerRegistry registry) {
-//        //广播式应配置一个/topic 消息代理
-//        registry.enableSimpleBroker("/topic");
-//    }
-    @Override
-    public void registerStompEndpoints(StompEndpointRegistry registry) { //endPoint 注册协议节点,并映射指定的URl
-
-        //注册一个名字为"endpointChat" 的endpoint,并指定 SockJS协议。   点对点-用
-        registry.addEndpoint("/endpointChat").withSockJS();
-    }
-
-
-    @Override
-    public void configureMessageBroker(MessageBrokerRegistry registry) {//配置消息代理(message broker)
-        //点对点式增加一个/queue 消息代理
-        registry.enableSimpleBroker("/queue", "/topic");
-
-    }
-}