diff --git a/.gitignore b/.gitignore
index 3e0d9aa6..14f81db9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ target
*.bpmn/
*logs/
.metadata
+
diff --git a/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java b/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java
index 40e96151..ddf9a6f0 100644
--- a/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java
+++ b/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java
@@ -75,7 +75,7 @@ public class CodeGen {
DataSourceConfig dsc = new DataSourceConfig();
dsc.setUrl("jdbc:mysql://"+DB_IP+"?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false");
//dsc.setSchemaName("public");//PostgreSQL schemaName
- dsc.setDriverName("com.mysql.jdbc.Driver");
+ dsc.setDriverName("com.mysql.cj.jdbc.Driver");
dsc.setUsername(DB_USER);
dsc.setPassword(DB_PWD);
mpg.setDataSource(dsc);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java
new file mode 100644
index 00000000..1535b10a
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java
@@ -0,0 +1,41 @@
+package com.adc.da.slrs.sarStandProjectLibrary.controller;
+
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.sarStandProjectLibrary.service.impl.SarStandProjectLibraryServiceImpl;
+import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+import javax.annotation.Resource;
+
+/**
+*
+ * 前端控制器
+ *
+*
+* @author ZhangJin
+* @since 2021-06-15
+*/
+@RestController
+@Api(description = "|SarStandProjectLibrary|")
+@RequestMapping("/sarStandProjectLibrary/sar-stand-project-library")
+public class SarStandProjectLibraryController extends BaseController {
+ @Resource
+ private SarStandProjectLibraryServiceImpl sarStandProjectLibraryService;
+ @GetMapping("/queryMaintenanceProject")
+ @ApiOperation("项目查询")
+ public ResponseMessage queryMaintenanceProject(@RequestParam(defaultValue = "1", value = "newStandPage")int Page, @RequestParam(defaultValue = "10", value = "newStandPageSize") int PageSize) {
+ IPage list = sarStandProjectLibraryService.queryMaintenanceProject(Page,PageSize);
+ return Result.success("200",list);
+ }
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java
new file mode 100644
index 00000000..fae67684
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java
@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarStandProjectLibrary.dao;
+
+import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author ZhangJin
+ * @since 2021-06-15
+ */
+public interface SarStandProjectLibraryDao extends BaseMapper {
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java
new file mode 100644
index 00000000..e8843c2d
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java
@@ -0,0 +1,66 @@
+package com.adc.da.slrs.sarStandProjectLibrary.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *
+ *
+ *
+ *
+ * @author ZhangJin
+ * @since 2021-06-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SarStandProjectLibrary对象", description="")
+public class SarStandProjectLibrary extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId("id")
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty(value = "产品平台")
+ private String projectPlatfor;
+
+ @ApiModelProperty(value = "项目编号")
+ private String projectNumber;
+
+ @ApiModelProperty(value = "项目名称")
+ private String projectName;
+
+ @ApiModelProperty(value = "项目分类")
+ private String projectClassification;
+
+ @ApiModelProperty(value = "项目状态")
+ private String projectStatus;
+
+ @ApiModelProperty(value = "项目群")
+ private String projectGroup;
+
+ @ApiModelProperty(value = "项目开始日期")
+ private Date projectStartDate;
+
+ @ApiModelProperty(value = "项目完成日期")
+ private Date projectEndDate;
+
+ @ApiModelProperty(value = "当前节点")
+ private String currentNode;
+
+ @ApiModelProperty(value = "项目级别")
+ private String projectLevel;
+
+ private String projectManager;
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
new file mode 100644
index 00000000..1fb25e63
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
@@ -0,0 +1,38 @@
+package com.adc.da.slrs.sarStandProjectLibrary.service.impl;
+
+import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary;
+import com.adc.da.slrs.sarStandProjectLibrary.dao.SarStandProjectLibraryDao;
+import com.adc.da.slrs.sarStandProjectLibrary.service.ISarStandProjectLibraryService;
+import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author ZhangJin
+ * @since 2021-06-15
+ */
+@Service
+public class SarStandProjectLibraryServiceImpl extends ServiceImpl implements ISarStandProjectLibraryService {
+ @Resource
+ private SarStandProjectLibraryDao sarStandProjectLibraryDao;
+ @Override
+ public IPage queryMaintenanceProject(int current,int pageSize) {
+ QueryWrapper wrapper= new QueryWrapper<>();
+ wrapper.inSql("id", "select project_id from sar_stand_project_relation");
+ Page page = new Page<>(current, pageSize);
+ IPage userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper);
+ System.out.println("总条数"+userIPage.getTotal());
+ System.out.println("总页数"+userIPage.getPages());
+ return userIPage;
+ }
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java
new file mode 100644
index 00000000..87b321e4
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java
@@ -0,0 +1,29 @@
+package com.adc.da.slrs.sarStandUnqualified.controller;
+
+
+import com.adc.da.slrs.sarStandUnqualified.service.ISarStandUnqualifiedService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+/**
+*
+ * 前端控制器
+ *
+*
+* @author super_liu
+* @since 2021-06-15
+*/
+@RestController
+@Api(tags = "未符合项整改")
+@RequestMapping("/sarStandUnqualified/sar-stand-unqualified")
+public class SarStandUnqualifiedController extends BaseController {
+ @Autowired
+ private ISarStandUnqualifiedService sarStandUnqualifiedService;
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java
new file mode 100644
index 00000000..d91792c6
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java
@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarStandUnqualified.dao;
+
+import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author super_liu
+ * @since 2021-06-15
+ */
+public interface SarStandUnqualifiedDao extends BaseMapper {
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java
new file mode 100644
index 00000000..d0ea4bc6
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java
@@ -0,0 +1,102 @@
+package com.adc.da.slrs.sarStandUnqualified.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *
+ *
+ *
+ *
+ * @author super_liu
+ * @since 2021-06-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SarStandUnqualified对象", description="")
+public class SarStandUnqualified extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "创建部门")
+ @TableField("CREATE_DEPT_ID")
+ private String createDeptId;
+
+ @ApiModelProperty(value = "创建人")
+ @TableField("CREATE_BY_ID")
+ private String createById;
+
+ @ApiModelProperty(value = "创建时间")
+ @TableField("CREATE_TIME")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "关闭状态(1为开启,2为关闭)")
+ @TableField("CLOSE_STATE")
+ private Integer closeState;
+
+ @ApiModelProperty(value = "实际关闭时间")
+ @TableField("ACTUAL_CLOSE_TIME")
+ private LocalDateTime actualCloseTime;
+
+ @ApiModelProperty(value = "计划关闭时间")
+ @TableField("PLAN_CLOSE_TIME")
+ private LocalDateTime planCloseTime;
+
+ @ApiModelProperty(value = "质量工程师")
+ @TableField("QA_ENGINEER")
+ private String qaEngineer;
+
+ @ApiModelProperty(value = "认证工程师")
+ @TableField("AUTH_ENGINEER")
+ private String authEngineer;
+
+ @ApiModelProperty(value = "责任工程师")
+ @TableField("DUTY_ENGINEER")
+ private String dutyEngineer;
+
+ @ApiModelProperty(value = "责任部门")
+ @TableField("RESPONSIBLE_UNIT")
+ private String responsibleUnit;
+
+ @ApiModelProperty(value = "项目名称")
+ @TableField("PRODUCT_NAME")
+ private String productName;
+
+ @ApiModelProperty(value = "产品线")
+ @TableField("PRODUCT_LINE")
+ private String productLine;
+
+ @ApiModelProperty(value = "产品类型(research为在研产品,product为在产产品)")
+ @TableField("PRODUCT_TYPE")
+ private String productType;
+
+ @ApiModelProperty(value = "条款名称")
+ @TableField("ITEMS_NAME")
+ private String itemsName;
+
+ @ApiModelProperty(value = "条款号")
+ @TableField("ITEMS_NUM")
+ private String itemsNum;
+
+ @ApiModelProperty(value = "标准名称")
+ @TableField("STAND_NAME")
+ private String standName;
+
+ @ApiModelProperty(value = "标准ID")
+ @TableField("STAND_ID")
+ private String standId;
+
+ @ApiModelProperty(value = "主键")
+ @TableId("ID")
+ private String id;
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/ISarStandUnqualifiedService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/ISarStandUnqualifiedService.java
new file mode 100644
index 00000000..765bc8bc
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/ISarStandUnqualifiedService.java
@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarStandUnqualified.service;
+
+import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author super_liu
+ * @since 2021-06-15
+ */
+public interface ISarStandUnqualifiedService extends IService {
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
new file mode 100644
index 00000000..66d459c9
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
@@ -0,0 +1,20 @@
+package com.adc.da.slrs.sarStandUnqualified.service.impl;
+
+import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified;
+import com.adc.da.slrs.sarStandUnqualified.dao.SarStandUnqualifiedDao;
+import com.adc.da.slrs.sarStandUnqualified.service.ISarStandUnqualifiedService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author super_liu
+ * @since 2021-06-15
+ */
+@Service
+public class SarStandUnqualifiedServiceImpl extends ServiceImpl implements ISarStandUnqualifiedService {
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java
index 950470bf..22b70ee3 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java
@@ -27,7 +27,21 @@ import java.util.Map;
public class EarlyWarningEOController extends BaseController {
@Resource
private EarlyWarningEOServiceImpl earlyWarningEOService;
-
+/**
+*
+ * @param newStandPage
+ * @param newStandPageSize
+ * @param oldStandPage
+ * @param oldStandPageSize
+ * @param newItemsPage
+ * @param newItemsPageSize
+ * @param oldItemsPage
+ * @param oldItemsPageSize
+ * @param applyType
+* @return
+* @author zj
+* date 2021-06-15
+**/
@GetMapping("/StandWarning")
@ApiOperation("标准预警查询")
public ResponseMessage newPageInfo(@RequestParam(defaultValue = "1", value = "newStandPage")int newStandPage, @RequestParam(defaultValue = "10", value = "newStandPageSize") int newStandPageSize,
@@ -50,14 +64,29 @@ public class EarlyWarningEOController extends BaseController {
listMap .add(map);
return Result.success("200",listMap);
}
-
+ /**
+ *
+ * @param id
+ * @return
+ * @author zj
+ * date 2021-06-15
+ **/
@GetMapping("/ChangePermissions")
@ApiOperation("更改权限")
public ResponseMessage ChangePermissions(String id) {
String power = earlyWarningEOService.ChangePermissions(id);
return Result.success("200",power);
}
-
+ /**
+ *
+ * @param newPolicyPage
+ * @param newPolicyPageSize
+ * @param oldPolicyPage
+ * @param oldPolicyPageSize
+ * @return
+ * @author zj
+ * date 2021-06-15
+ **/
@GetMapping("/PolicyWarning")
@ApiOperation("政策预警查询")
public ResponseMessage newPolicyPageInfo(@RequestParam(defaultValue = "1", value = "newPolicyPage")int newPolicyPage, @RequestParam(defaultValue = "10", value = "newPolicyPageSize") int newPolicyPageSize,
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/adc-da-slrs/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/adc-da-slrs/SarStandUnqualifiedMapper.xml
new file mode 100644
index 00000000..f8a704c8
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/adc-da-slrs/SarStandUnqualifiedMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
new file mode 100644
index 00000000..d5caed43
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml
new file mode 100644
index 00000000..b90da545
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+