diff --git a/adc-da-main/.gitignore b/adc-da-main/.gitignore index 549e00a2..45ae2499 100644 --- a/adc-da-main/.gitignore +++ b/adc-da-main/.gitignore @@ -31,3 +31,8 @@ build/ ### VS Code ### .vscode/ + +src/main/resources/application.properties +src/main/resources/** + +** 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..0f660d81 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 @@ -22,11 +22,11 @@ public class CodeGen { // x.x.x.x:3306/xxxx --MYSQL // 192.168.10.140:1521:foton_slrs_test - private static final String DB_IP="127.0.0.1:3306/foton_slrs"; + private static final String DB_IP="127.0.0.1:3306/foton_slrs_test"; private static final String DB_USER="root"; - private static final String DB_PWD="root"; + private static final String DB_PWD="Zxy20010202"; /** @@ -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-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 1439004b..f31c1760 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,10 +3,11 @@ # 数据库配置 #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://101.36.227.22:33050/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +#spring.datasource.url = jdbc:mysql://101.36.227.22:33050/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +spring.datasource.url = jdbc:mysql://localhost:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.username = root -spring.datasource.password = 1q2w3e4r - +#spring.datasource.password = 1q2w3e4r +spring.datasource.password=Zxy20010202 #============================================== # 应用设置 spring.application.name=FotonLAWSSystem 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..8336f8a6 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.sarStandUnqualified.controller; + + +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(description = "|SarStandUnqualified|") +@RequestMapping("/sarStandUnqualified/sar-stand-unqualified") +public class SarStandUnqualifiedController extends BaseController+ * Mapper 接口 + *
+ * + * @author super_liu + * @since 2021-06-15 + */ +public interface SarStandUnqualifiedDao extends BaseMapper+ * + *
+ * + * @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+ * 服务实现类 + *
+ * + * @author super_liu + * @since 2021-06-15 + */ +@Service +public class SarStandUnqualifiedServiceImpl extends ServiceImpl