UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into test

Browse Source
test^2
wangwei 2 years ago
parent 19b5e2b163 b27758f8db
commit af1e623dad
29 changed files with 1103 additions and 419 deletions

716
pom.xml
Unescape Escape View File

@ -22,362 +22,366 @@
<java.version>1.8</java.version>
</properties>
<dependencies>
<!--Json 操作-->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>2.0.4</version>
</dependency>
<!--common-->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.9</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<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>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<!--Redis-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<!--热启动-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional>
</dependency>
<!--数据库相关-->
<!--MySQL-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.21</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc14</artifactId>
<version>10.2.0.4.0</version>
<type>pom</type>
</dependency>
<!--mybatis plus -->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.5.2</version>
</dependency>
<!--分页插件-->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.4.2</version>
<!--使用spring boot2整合 pagehelper-spring-boot-starter必须排除一下依赖
因为pagehelper-spring-boot-starter也已经在pom依赖了mybatis与mybatis-spring
所以会与mybatis-plus-boot-starter中的mybatis与mybatis-spring发生冲突
-->
<exclusions>
<exclusion>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
</exclusion>
<exclusion>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-spring</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--mybatis-plus性能分析SQL打印插件-->
<dependency>
<groupId>p6spy</groupId>
<artifactId>p6spy</artifactId>
<version>3.9.1</version>
</dependency>
<!--自动生成 GET SET-->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<!--JWT-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>0.9.1</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.2</version>
</dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-autoconfigure</artifactId>
<version>1.4.5</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<!--解析excel-->
<!--xls-->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>4.0.0</version>
</dependency>
<!--xlsx-->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>4.0.0</version>
</dependency>
<!-- PDF打印 -->
<dependency>
<groupId>com.glxp</groupId>
<artifactId>tochina</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itextpdf</artifactId>
<version>5.5.13.1</version>
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itext-asian</artifactId>
<version>5.2.0</version>
</dependency>
<!--Hutool是一个小而全的Java工具类库-->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.8.18</version>
</dependency>
<dependency>
<groupId>com.belerweb</groupId>
<artifactId>pinyin4j</artifactId>
<version>2.5.0</version>
</dependency>
<!-- 二维码工具 考虑到Hutool的非强制依赖性，因此zxing需要用户自行引入 -->
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
<version>3.3.3</version>
</dependency>
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId>
<version>3.3.3</version>
</dependency>
<dependency>
<groupId>org.olap4j</groupId>
<artifactId>olap4j</artifactId>
<version>1.2.0</version>
</dependency>
<!-- jasperreports-dependency-begin -->
<!-- jasperreports-->
<!-- https://mvnrepository.com/artifact/net.sf.barcode4j/barcode4j -->
<!-- jasperreports相关 -->
<dependency>
<groupId>net.sf.barcode4j</groupId>
<artifactId>barcode4j</artifactId>
<version>2.1</version>
<exclusions>
<exclusion>
<groupId>org.olap4je</groupId>
<artifactId>olap4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports</artifactId>
<version>6.5.1</version>
<exclusions>
<exclusion>
<groupId>com.lowagie</groupId>
<artifactId>itext</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports-fonts</artifactId>
<version>6.0.0</version>
</dependency>
<!-- 汉字 转 拼音/首字母-->
<dependency>
<groupId>com.belerweb</groupId>
<artifactId>pinyin4j</artifactId>
<version>2.5.1</version>
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itext-pdfa</artifactId>
<version>5.5.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>3.0.7</version>
</dependency>
<dependency>
<groupId>cn.lesper</groupId>
<artifactId>iTextAsian</artifactId>
<version>3.0</version>
</dependency>
<!--excel-->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>2.2.10</version>
</dependency>
<dependency>
<groupId>hu.blackbelt.bundles.swagger-parser</groupId>
<artifactId>io.swagger.parser</artifactId>
<version>1.0.47_1</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.xmlgraphics/batik-bridge -->
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-bridge</artifactId>
<version>1.11</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.xmlgraphics/batik-dom -->
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-dom</artifactId>
<version>1.11</version>
</dependency>
<dependency>
<groupId>org.eclipse.birt.runtime.3_7_1</groupId>
<artifactId>com.lowagie.text</artifactId>
<version>2.1.7</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>3.10.0</version>
</dependency>
<!-- jasperreports end-->
<!-- jasperreports-dependency-end -->
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-spring-boot-starter</artifactId>
<version>1.30.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.plugin</groupId>
<artifactId>spring-plugin-core</artifactId>
<version>2.0.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.plugin</groupId>
<artifactId>spring-plugin-metadata</artifactId>
<version>2.0.0.RELEASE</version>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId>
<version>2.0.9</version>
</dependency>
</dependencies>
<dependencies>
<!--Json 操作-->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>2.0.4</version>
</dependency>
<!--common-->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.9</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<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>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<!--Redis-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<!--热启动-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional>
</dependency>
<!--数据库相关-->
<!--MySQL-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.21</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc14</artifactId>
<version>10.2.0.4.0</version>
<type>pom</type>
</dependency>
<!--mybatis plus -->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.5.2</version>
</dependency>
<!--分页插件-->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.4.2</version>
<!--使用spring boot2整合 pagehelper-spring-boot-starter必须排除一下依赖
因为pagehelper-spring-boot-starter也已经在pom依赖了mybatis与mybatis-spring
所以会与mybatis-plus-boot-starter中的mybatis与mybatis-spring发生冲突
-->
<exclusions>
<exclusion>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
</exclusion>
<exclusion>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-spring</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--mybatis-plus性能分析SQL打印插件-->
<dependency>
<groupId>p6spy</groupId>
<artifactId>p6spy</artifactId>
<version>3.9.1</version>
</dependency>
<!--自动生成 GET SET-->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<!--JWT-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>0.9.1</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.2</version>
</dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-autoconfigure</artifactId>
<version>1.4.5</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<!--解析excel-->
<!--xls-->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>4.0.0</version>
</dependency>
<!--xlsx-->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>4.0.0</version>
</dependency>
<!-- PDF打印 -->
<dependency>
<groupId>com.glxp</groupId>
<artifactId>tochina</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itextpdf</artifactId>
<version>5.5.13.1</version>
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itext-asian</artifactId>
<version>5.2.0</version>
</dependency>
<!--Hutool是一个小而全的Java工具类库-->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.8.18</version>
</dependency>
<dependency>
<groupId>com.belerweb</groupId>
<artifactId>pinyin4j</artifactId>
<version>2.5.0</version>
</dependency>
<!-- 二维码工具 考虑到Hutool的非强制依赖性，因此zxing需要用户自行引入 -->
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
<version>3.3.3</version>
</dependency>
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId>
<version>3.3.3</version>
</dependency>
<dependency>
<groupId>org.olap4j</groupId>
<artifactId>olap4j</artifactId>
<version>1.2.0</version>
</dependency>
<!-- jasperreports-dependency-begin -->
<!-- jasperreports-->
<!-- https://mvnrepository.com/artifact/net.sf.barcode4j/barcode4j -->
<!-- jasperreports相关 -->
<dependency>
<groupId>net.sf.barcode4j</groupId>
<artifactId>barcode4j</artifactId>
<version>2.1</version>
<exclusions>
<exclusion>
<groupId>org.olap4je</groupId>
<artifactId>olap4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports</artifactId>
<version>6.5.1</version>
<exclusions>
<exclusion>
<groupId>com.lowagie</groupId>
<artifactId>itext</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports-fonts</artifactId>
<version>6.0.0</version>
</dependency>
<!-- 汉字 转 拼音/首字母-->
<dependency>
<groupId>com.belerweb</groupId>
<artifactId>pinyin4j</artifactId>
<version>2.5.1</version>
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itext-pdfa</artifactId>
<version>5.5.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>3.0.7</version>
</dependency>
<dependency>
<groupId>cn.lesper</groupId>
<artifactId>iTextAsian</artifactId>
<version>3.0</version>
</dependency>
<!--excel-->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>2.2.10</version>
</dependency>
<dependency>
<groupId>hu.blackbelt.bundles.swagger-parser</groupId>
<artifactId>io.swagger.parser</artifactId>
<version>1.0.47_1</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.xmlgraphics/batik-bridge -->
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-bridge</artifactId>
<version>1.11</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.xmlgraphics/batik-dom -->
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-dom</artifactId>
<version>1.11</version>
</dependency>
<dependency>
<groupId>org.eclipse.birt.runtime.3_7_1</groupId>
<artifactId>com.lowagie.text</artifactId>
<version>2.1.7</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>3.10.0</version>
</dependency>
<!-- jasperreports end-->
<!-- jasperreports-dependency-end -->
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-spring-boot-starter</artifactId>
<version>1.30.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.plugin</groupId>
<artifactId>spring-plugin-core</artifactId>
<version>2.0.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.plugin</groupId>
<artifactId>spring-plugin-metadata</artifactId>
<version>2.0.0.RELEASE</version>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId>
<version>2.0.9</version>
</dependency>
<!-- https://github.com/TooTallNate/Java-WebSocket-->
<dependency>
<groupId>org.java-websocket</groupId>
<artifactId>Java-WebSocket</artifactId>
<version>1.5.4</version>
</dependency>
</dependencies>
<build>
<finalName>UDI_WMS_MC</finalName>

1
src/main/java/com/glxp/api/common/enums/ResultEnum.java
Unescape Escape View File

@ -17,6 +17,7 @@ public enum ResultEnum {
DATA_CHANGE(6, "数据没有任何更改"),
DATA_REPEAT(7, "数据已存在"),
DATA_ERROR(8, "参数错误"),
;
private Integer code;

15
src/main/java/com/glxp/api/common/req/UpdateRequest.java
Unescape Escape View File

@ -28,4 +28,19 @@ public class UpdateRequest {
*/
private String auditOpinion;
/**
* 维修人
*/
private String repariName;
/**
* 维修照片
*/
private String repariImage;
/**
* 维修说明
*/
private String repariRemark;
}

28
src/main/java/com/glxp/api/controller/TestController.java
Unescape Escape View File

@ -0,0 +1,28 @@
package com.glxp.api.controller;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.req.sync.BasicExportStatusRequest;
import com.glxp.api.task.TestStatOrderService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
@Slf4j
@RestController
public class TestController {
@Resource
TestStatOrderService statOrderService;
@GetMapping("/test/stat/order")
public BaseResponse getStatus(BasicExportStatusRequest basicExportStatusRequest) {
long start = System.currentTimeMillis();
statOrderService.starGen(start);
long end = System.currentTimeMillis();
return ResultVOUtils.success("生成成功！" + start + "=====" + end + "\n-------" + (start - end));
}
}

99
src/main/java/com/glxp/api/controller/inv/DeviceProjectSetController.java
Unescape Escape View File

@ -0,0 +1,99 @@
package com.glxp.api.controller.inv;
import com.github.pagehelper.PageInfo;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.req.inv.DeviceProjectSetRequest;
import com.glxp.api.res.inv.DeviceProjectSetResponse;
import com.glxp.api.service.inv.DeviceProjectSetService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
* 维保设备接口
*/
@Slf4j
@RestController
public class DeviceProjectSetController {
@Resource
private DeviceProjectSetService deviceProjectSetService;
/**
* 查询维保设备列表
*
* @param deviceProjectSetRequest
* @return
*/
@GetMapping("/udiwms/inv/device/project/set/filter")
public BaseResponse filterList(DeviceProjectSetRequest deviceProjectSetRequest) {
List<DeviceProjectSetResponse> list = deviceProjectSetService.filterList(deviceProjectSetRequest);
PageInfo<DeviceProjectSetResponse> pageInfo = new PageInfo<>(list);
return ResultVOUtils.page(pageInfo);
}
/**
* 添加维保设备维护
*
* @param deviceProjectSetRequest
* @return
*/
@PostMapping("/udiwms/inv/device/project/set/insertDevprojectSet")
public BaseResponse insertDevprojectSet(@RequestBody DeviceProjectSetRequest deviceProjectSetRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
//判断编码是否存在
boolean b = deviceProjectSetService.chcekCode(deviceProjectSetRequest.getCode(), null);
if(b){
return ResultVOUtils.error(999,"编码已存在!");
}
deviceProjectSetService.insertDevprojectSet(deviceProjectSetRequest);
return ResultVOUtils.success("添加成功");
}
/**
* 更新维保设备维护信息
*
* @param deviceProjectSetRequest
* @return
*/
@PostMapping("/udiwms/inv/device/project/set/updateDevprojectSet")
public BaseResponse updateDevprojectSet(@RequestBody DeviceProjectSetRequest deviceProjectSetRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
//判断编号是否存在
boolean b = deviceProjectSetService.chcekCode(deviceProjectSetRequest.getCode(), deviceProjectSetRequest.getId() + "");
if(b){
return ResultVOUtils.error(999,"编码已存在!");
}
deviceProjectSetService.updateDevprojectSet(deviceProjectSetRequest);
return ResultVOUtils.success("更新成功");
}
/**
* 删除维保设备维护
*
* @param id
* @return
*/
@GetMapping("/udiwms/inv/device/project/set/deleteDevprojectSet")
public BaseResponse deleteDevprojectSet(String id) {
deviceProjectSetService.deleteDevprojectSet(id);
return ResultVOUtils.success("删除成功");
}
}

37
src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderController.java
Unescape Escape View File

@ -96,9 +96,44 @@ public class DeviceRepairOrderController {
if (null == updateRequest) {
return ResultVOUtils.paramVerifyFail();
}
return deviceRepairOrderService.updateStatus(updateRequest.getOrderId(), updateRequest.getStatus());
if(!"".equals(updateRequest.getRepariName()) && null !=updateRequest.getRepariName() ){
return deviceRepairOrderService.updateStatus(updateRequest.getOrderId(), updateRequest.getStatus(),updateRequest.getRepariName());
}else
return deviceRepairOrderService.updateStatus(updateRequest.getOrderId(), updateRequest.getStatus(),null);
}
/**
* 开始任务
* 更新报修单状态和维修时间
*
* @param updateRequest
* @return
*/
@PostMapping("/udiwms/inv/device/repair/order/updateStatusAndTime")
public BaseResponse updateStatusAndTime(@RequestBody UpdateRequest updateRequest) {
if (null == updateRequest) {
return ResultVOUtils.paramVerifyFail();
}
return deviceRepairOrderService.updateStatusAndTime(updateRequest.getOrderId(), updateRequest.getStatus());
}
/**
* 结束任务
* 更新报修单状态 维修时间 维修照片
*
* @param updateRequest
* @return
*/
@PostMapping("/udiwms/inv/device/repair/order/updateStatusAndImg")
public BaseResponse updateStatusAndImg(@RequestBody UpdateRequest updateRequest) {
if (null == updateRequest) {
return ResultVOUtils.paramVerifyFail();
}
return deviceRepairOrderService.updateStatusAndImg(updateRequest.getOrderId(), updateRequest.getStatus(),
updateRequest.getRepariImage(),updateRequest.getRepariRemark());
}
/**
* 删除报修单
*

64
src/main/java/com/glxp/api/controller/purchase/SupProductController.java
Unescape Escape View File

@ -86,11 +86,10 @@ public class SupProductController {
@PostMapping("/sup/product/addRegistration")
@Log(title = "资质证书", businessType = BusinessType.INSERT)
public BaseResponse addRegistration(@RequestBody SupProductEntity supProductEntity) {
System.out.println(supProductEntity.toString());
//提交审核
if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) {
//判断是否上级供应商是否审核通过
SupManufacturerEntity supManufacturerEntity = supManufacturerService.findManufacturer(supProductEntity.getManufacturerIdFk());
if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_UN
|| supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_DRAFT) {
@ -135,15 +134,22 @@ public class SupProductController {
return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！");
}
}
supProductEntity.setCreateTime(new Date());
supProductEntity.setUpdateTime(new Date());
supProductEntity.setId(IdUtil.getSnowflakeNextId());
boolean b = supProductService.insertRegistration(supProductEntity);
if (b) {
return ResultVOUtils.success("添加成功");
int i = supProductService.findProduct(supProductEntity);
System.out.println(i);
if (i == 0) {
supProductEntity.setCreateTime(new Date());
supProductEntity.setUpdateTime(new Date());
supProductEntity.setId(IdUtil.getSnowflakeNextId());
boolean b = supProductService.insertRegistration(supProductEntity);
if (b) {
return ResultVOUtils.success("添加成功");
} else {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
} else {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
return ResultVOUtils.error(ResultEnum.DATA_REPEAT);
}
}
@ -153,27 +159,27 @@ public class SupProductController {
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectUdiId(Long.valueOf(selectProductBindRequest.getRelIdFk()));
SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(), selectProductBindRequest.getManufacturerId());
if (supProductEntity != null) {
return ResultVOUtils.error(500, "该产品资质已存在，请勿重复添加！");
} else {
supProductEntity = new SupProductEntity();
BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity);
supProductEntity.setProductId(selectProductBindRequest.getProductId());
supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh());
supProductEntity.setRelIdFk(udiRelevanceResponse.getId() + "");
supProductEntity.setRecordProductName(udiRelevanceResponse.getCpmctymc());
supProductEntity.setProductType(udiRelevanceResponse.getQxlb());
supProductEntity.setProductDirectoryCode(udiRelevanceResponse.getFlbm());
supProductEntity.setRecordPeopleName(udiRelevanceResponse.getYlqxzcrbarmc());
supProductEntity.setSpecification(udiRelevanceResponse.getGgxh());
supProductEntity.setCreateTime(new Date());
supProductEntity.setUpdateTime(new Date());
supProductEntity.setManufacturerIdFk(selectProductBindRequest.getManufacturerId());
supProductEntity.setCustomerId(selectProductBindRequest.getCustomerId());
supProductEntity.setHchzsb(udiRelevanceResponse.getCplb());
// if (supProductEntity != null) {
//// return ResultVOUtils.error(500, "该产品资质已存在，请勿重复添加！");
// } else {
supProductEntity = new SupProductEntity();
BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity);
supProductEntity.setProductId(selectProductBindRequest.getProductId());
supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh());
supProductEntity.setRelIdFk(udiRelevanceResponse.getId() + "");
supProductEntity.setRecordProductName(udiRelevanceResponse.getCpmctymc());
supProductEntity.setProductType(udiRelevanceResponse.getQxlb());
supProductEntity.setProductDirectoryCode(udiRelevanceResponse.getFlbm());
supProductEntity.setRecordPeopleName(udiRelevanceResponse.getYlqxzcrbarmc());
supProductEntity.setSpecification(udiRelevanceResponse.getGgxh());
supProductEntity.setCreateTime(new Date());
supProductEntity.setUpdateTime(new Date());
supProductEntity.setManufacturerIdFk(selectProductBindRequest.getManufacturerId());
supProductEntity.setCustomerId(selectProductBindRequest.getCustomerId());
supProductEntity.setHchzsb(udiRelevanceResponse.getCplb());
// supProductEntity.setCompanyName(selectProductBindRequest.getCompanyName());
supProductEntity.setAuditStatus(selectProductBindRequest.getAuditStatus());
}
supProductEntity.setAuditStatus(selectProductBindRequest.getAuditStatus());
// }
return ResultVOUtils.success(supProductEntity);

9
src/main/java/com/glxp/api/dao/inv/DeviceProjectSetMapper.java
Unescape Escape View File

@ -2,8 +2,15 @@ package com.glxp.api.dao.inv;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.inv.DeviceProjectSet;
import com.glxp.api.req.inv.DeviceProjectSetRequest;
import com.glxp.api.res.inv.DeviceProjectSetResponse;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface DeviceProjectSetMapper extends BaseMapper<DeviceProjectSet> {
}
List<DeviceProjectSetResponse> filterList(DeviceProjectSetRequest deviceProjectSetRequest);
}

2
src/main/java/com/glxp/api/dao/purchase/SupProductDao.java
Unescape Escape View File

@ -26,7 +26,7 @@ public interface SupProductDao extends BaseMapperPlus<SupProductDao,SupProductEn
boolean insertRegistration(SupProductEntity supProductEntity);
boolean deleteById(@Param("id") String id);
int findProduct(SupProductEntity supProductEntity);
boolean deleteByEnterpriseId(@Param("enterpriseId") String enterpriseId);
}

5
src/main/java/com/glxp/api/entity/inv/DeviceProjectSet.java
Unescape Escape View File

@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
@Data
@TableName(value = "device_project_set")
@ -63,4 +64,4 @@ public class DeviceProjectSet implements Serializable {
private Date createTime;
private static final long serialVersionUID = 1L;
}
}

8
src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderEntity.java
Unescape Escape View File

@ -43,7 +43,7 @@ public class DeviceRepairOrderEntity {
private String code;
/**
* 状态（0：新增；1：未审核；2：已审核；3。已处理）
* 状态（0：草稿；1：未审核；2：已审核；3：未处理 4：维修中 5：已处理）
*/
@TableField(value = "`status`")
private Integer status;
@ -95,7 +95,7 @@ public class DeviceRepairOrderEntity {
/**
* 维修类型 1:自行维修；2：外部维修
*/
private String repairType;
private Integer repairType;
/**
* 紧急类型 1,正常；2,较急；3,特急
*/
@ -117,11 +117,11 @@ public class DeviceRepairOrderEntity {
/**
* 维修开始时间
*/
private String repariStartTime;
private Date repariStartTime;
/**
* 维修结束时间
*/
private String repariEndTime;
private Date repariEndTime;
/**
* 维修说明
*/

45
src/main/java/com/glxp/api/req/inv/AddDeviceRepairOrderRequest.java
Unescape Escape View File

@ -2,6 +2,8 @@ package com.glxp.api.req.inv;
import lombok.Data;
import java.util.Date;
/**
* 添加设备报修单参数
*/
@ -24,7 +26,7 @@ public class AddDeviceRepairOrderRequest {
private String code;
/**
* 状态（1：新增；2：未审核；3：已审核）
* 状态（0：草稿；1：未审核；2：已审核；3：未处理 4：维修中 5：已处理）
*/
private Integer status;
@ -38,4 +40,45 @@ public class AddDeviceRepairOrderRequest {
*/
private String remark;
// ----------------------新增字段=-------------------------------
/**
* 维修类型 1:自行维修；2：外部维修
*/
private Integer repairType;
/**
* 紧急类型 1,正常；2,较急；3,特急
*/
private Integer urgencyType;
/**
* 计划完成日期
*/
private Date planTime;
/**
* 报修图片
*/
private String uploadImage;
/**
* 维修人
*/
private String repariName;
/**
* 维修开始时间
*/
private String repariStartTime;
/**
* 维修结束时间
*/
private String repariEndTime;
/**
* 维修说明
*/
private String repariRemark;
/**
* 维修图片
*/
private String repariImage;
}

55
src/main/java/com/glxp/api/req/inv/DeviceProjectSetRequest.java
Unescape Escape View File

@ -0,0 +1,55 @@
package com.glxp.api.req.inv;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
import java.util.Date;
@Data
public class DeviceProjectSetRequest extends ListPageRequest {
private Integer id;
/**
* 项目编号
*/
private String code;
/**
* 项目内容
*/
private String content;
/**
* 项目类型：1：巡检；2：养护
*/
private Integer type;
/**
* 备注
*/
private String remak;
/**
* 更新时间
*/
private Date udpateTime;
/**
* 更新人
*/
private String updateUser;
/**
* 创建人
*/
private String createUser;
/**
* 创建时间
*/
private Date createTime;
private String startTime;
private String endTime;
}

11
src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderRequest.java
Unescape Escape View File

@ -3,6 +3,8 @@ package com.glxp.api.req.inv;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
import java.util.List;
/**
* 查询部门设备报修单接口参数
*/
@ -32,8 +34,15 @@ public class FilterDeviceRepairOrderRequest extends ListPageRequest {
private String code;
/**
* 状态（1：新增；2：未审核；3：已审核）
* 状态（0：草稿；1：未审核；2：已审核；3：未处理 4：维修中 5：已处理）
*/
private Integer status;
private List<Integer> statusList;
/**
* 维修人
*/
private String repariName;
}

9
src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
Unescape Escape View File

@ -212,6 +212,8 @@ public class IoOrderResponse {
private String customerName;
/**
* 导出状态/上传状态（0.未导出，1.已导出，2.导出失败）
*/
@ -253,4 +255,11 @@ public class IoOrderResponse {
return fromInvName;
return fromName;
}
public Integer getExportStatus() {
if(exportStatus == null){
return 0;
}
return exportStatus;
}
}

60
src/main/java/com/glxp/api/res/inv/DeviceProjectSetResponse.java
Unescape Escape View File

@ -0,0 +1,60 @@
package com.glxp.api.res.inv;
import lombok.Data;
import java.util.Date;
@Data
public class DeviceProjectSetResponse {
private Integer id;
/**
* 项目编号
*/
private String code;
/**
* 项目内容
*/
private String content;
/**
* 项目类型：1：巡检；2：养护
*/
private Integer type;
/**
* 备注
*/
private String remak;
/**
* 更新时间
*/
private Date udpateTime;
/**
* 更新人
*/
private String updateUser;
/**
* 更新人名称
*/
private String updateUserName;
/**
* 创建人
*/
private String createUser;
/**
* 创建人名称
*/
private String createUserName;
/**
* 创建时间
*/
private Date createTime;
}

47
src/main/java/com/glxp/api/res/inv/DeviceRepairOrderResponse.java
Unescape Escape View File

@ -33,7 +33,7 @@ public class DeviceRepairOrderResponse {
private String code;
/**
* 状态（0：新增；1：未审核；2：已审核）
* 状态（0：草稿；1：未审核；2：已审核；3：未处理 4：维修中 5：已处理）
*/
private Integer status;
@ -102,4 +102,49 @@ public class DeviceRepairOrderResponse {
*/
private String batchNo;
// ----------------------新增字段=-------------------------------
/**
* 维修类型 1:自行维修；2：外部维修
*/
private Integer repairType;
/**
* 紧急类型 1,正常；2,较急；3,特急
*/
private Integer urgencyType;
/**
* 计划完成日期
*/
private Date planTime;
/**
* 报修图片
*/
private String uploadImage;
/**
* 维修人
*/
private String repariName;
/**
* 维修人名称
*/
private String repName;
/**
* 维修开始时间
*/
private String repariStartTime;
/**
* 维修结束时间
*/
private String repariEndTime;
/**
* 维修说明
*/
private String repariRemark;
/**
* 维修图片
*/
private String repariImage;
}

5
src/main/java/com/glxp/api/service/inout/impl/PlatformServiceImpl.java
Unescape Escape View File

@ -388,10 +388,15 @@ public class PlatformServiceImpl implements PlatformService {
IoOrderEntity ioOrderEntity1=new IoOrderEntity();
ioOrderEntity1.setFromSpmsOrders(formSpmsOrders);
ioOrderEntity1.setBillNo(orderId);
ioOrderEntity1.setExportStatus(1);
ioOrderService.updateByBillNo(ioOrderEntity1);
return JSON.parseObject(resp, BaseResponse.class);
} else {
log.error("获取自助平台分库失败");
IoOrderEntity ioOrderEntity1=new IoOrderEntity();
ioOrderEntity1.setBillNo(orderId);
ioOrderEntity1.setExportStatus(2);
ioOrderService.updateByBillNo(ioOrderEntity1);
return ResultVOUtils.error(500, "获取自助平台接口异常");
}
}

71
src/main/java/com/glxp/api/service/inv/DeviceProjectSetService.java
Unescape Escape View File

@ -1,12 +1,77 @@
package com.glxp.api.service.inv;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.inv.DeviceProjectSetMapper;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.inv.DeviceProjectSet;
import com.glxp.api.req.inv.DeviceProjectSetRequest;
import com.glxp.api.res.inv.DeviceProjectSetResponse;
import com.glxp.api.service.auth.CustomerService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.glxp.api.entity.inv.DeviceProjectSet;
import com.glxp.api.dao.inv.DeviceProjectSetMapper;
@Service
public class DeviceProjectSetService extends ServiceImpl<DeviceProjectSetMapper, DeviceProjectSet> {
@Resource
DeviceProjectSetMapper deviceProjectSetMapper;
@Resource
CustomerService customerService;
public List<DeviceProjectSetResponse> filterList(DeviceProjectSetRequest deviceProjectSetRequest) {
if (null == deviceProjectSetRequest) {
return Collections.emptyList();
}
if (null != deviceProjectSetRequest.getPage() && null != deviceProjectSetRequest.getLimit()) {
PageHelper.offsetPage((deviceProjectSetRequest.getPage() - 1) * deviceProjectSetRequest.getLimit(), deviceProjectSetRequest.getLimit());
}
return deviceProjectSetMapper.filterList(deviceProjectSetRequest);
}
public boolean insertDevprojectSet(DeviceProjectSetRequest deviceProjectSetRequest) {
AuthAdmin user = customerService.getUserBean();
DeviceProjectSet projectSet = new DeviceProjectSet();
BeanUtils.copyProperties(deviceProjectSetRequest, projectSet);
projectSet.setCreateTime(new Date());
projectSet.setCreateUser(user.getId()+"");
return deviceProjectSetMapper.insert(projectSet) > 0;
}
public boolean deleteDevprojectSet(String id) {
return deviceProjectSetMapper.deleteById(id) > 0;
}
public boolean updateDevprojectSet(DeviceProjectSetRequest deviceProjectSetRequest) {
AuthAdmin user = customerService.getUserBean();
DeviceProjectSet projectSet = new DeviceProjectSet();
BeanUtils.copyProperties(deviceProjectSetRequest, projectSet);
projectSet.setUdpateTime(new Date());
projectSet.setUpdateUser(user.getId()+"");
return deviceProjectSetMapper.updateById(projectSet) > 0;
}
public boolean chcekCode(String code, String id) {
List<DeviceProjectSet> list = null;
if (id != null && !"".equals(id)) {
list = deviceProjectSetMapper.selectList(new QueryWrapper<DeviceProjectSet>().eq("code", code).ne("id", id));
} else
list = deviceProjectSetMapper.selectList(new QueryWrapper<DeviceProjectSet>().eq("code", code));
if (list != null && list.size() > 0) {
return true;
} else
return false;
}
}

7
src/main/java/com/glxp/api/service/inv/DeviceRepairOrderService.java
Unescape Escape View File

@ -52,7 +52,12 @@ public interface DeviceRepairOrderService {
* @param status
* @return
*/
BaseResponse updateStatus(String orderId, Integer status);
BaseResponse updateStatus(String orderId, Integer status,String repariName);
BaseResponse updateStatusAndTime(String orderId, Integer status);
BaseResponse updateStatusAndImg(String orderId, Integer status,String repariImage,String repariRemark);
/**
* 删除设备报修单

55
src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java
Unescape Escape View File

@ -7,6 +7,7 @@ import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.Constant;
import com.glxp.api.dao.inv.DeviceRepairOrderDao;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.inv.DeviceRepairOrderEntity;
import com.glxp.api.req.inv.AddDeviceRepairOrderRequest;
import com.glxp.api.req.inv.FilterDeviceRepairOrderRequest;
@ -18,7 +19,6 @@ import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.OrderNoTypeBean;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
@ -62,6 +62,10 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService {
deviceRepairOrderEntity.setStatus(0);
deviceRepairOrderEntity.setCreateTime(date);
deviceRepairOrderEntity.setUpdateTime(date);
deviceRepairOrderEntity.setRepairType(addDeviceRepairOrderRequest.getRepairType());
deviceRepairOrderEntity.setUrgencyType(addDeviceRepairOrderRequest.getUrgencyType());
deviceRepairOrderEntity.setPlanTime(addDeviceRepairOrderRequest.getPlanTime());
deviceRepairOrderEntity.setUploadImage(addDeviceRepairOrderRequest.getUploadImage());
deviceRepairOrderDao.insert(deviceRepairOrderEntity);
return ResultVOUtils.success();
}
@ -88,20 +92,55 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService {
}
@Override
public BaseResponse updateStatus(String orderId, Integer status) {
public BaseResponse updateStatus(String orderId, Integer status,String repariName) {
if (StrUtil.isBlank(orderId) || null == status) {
return ResultVOUtils.paramVerifyFail();
}
AuthAdmin authAdmin=customerService.getUserBean();
DeviceRepairOrderEntity deviceRepairOrderEntity = deviceRepairOrderDao.selectByOrderId(orderId);
deviceRepairOrderEntity.setStatus(status);
Date date = new Date();
if (status == 2) {
//审核通过，生成维保单
deviceInspectOrderService.addByRepairOrderId(orderId);
deviceRepairOrderEntity.setAuditUser(customerService.getUserIdStr());
deviceRepairOrderEntity.setAuditTime(date);
}
// if (status == 2) {
// //审核通过，生成维保单
// deviceInspectOrderService.addByRepairOrderId(orderId);
// deviceRepairOrderEntity.setAuditUser(customerService.getUserIdStr());
// deviceRepairOrderEntity.setAuditTime(date);
// }
deviceRepairOrderEntity.setUpdateTime(date);
deviceRepairOrderEntity.setAuditTime(date);
deviceRepairOrderEntity.setAuditUser(authAdmin.getId()+"");
if(null != repariName){
deviceRepairOrderEntity.setRepariName(repariName);
}
deviceRepairOrderDao.updateById(deviceRepairOrderEntity);
return ResultVOUtils.success();
}
@Override
public BaseResponse updateStatusAndTime(String orderId, Integer status) {
if (StrUtil.isBlank(orderId) || null == status) {
return ResultVOUtils.paramVerifyFail();
}
DeviceRepairOrderEntity deviceRepairOrderEntity = deviceRepairOrderDao.selectByOrderId(orderId);
deviceRepairOrderEntity.setStatus(status);
//插入开始时间
deviceRepairOrderEntity.setRepariStartTime(new Date());
deviceRepairOrderDao.updateById(deviceRepairOrderEntity);
return ResultVOUtils.success();
}
@Override
public BaseResponse updateStatusAndImg(String orderId, Integer status, String repariImage, String repariRemark) {
if (StrUtil.isBlank(orderId) || null == status) {
return ResultVOUtils.paramVerifyFail();
}
DeviceRepairOrderEntity deviceRepairOrderEntity = deviceRepairOrderDao.selectByOrderId(orderId);
deviceRepairOrderEntity.setStatus(status);
//插入结束时间
deviceRepairOrderEntity.setRepariEndTime(new Date());
deviceRepairOrderEntity.setRepariImage(repariImage);
deviceRepairOrderEntity.setRepariRemark(repariRemark);
deviceRepairOrderDao.updateById(deviceRepairOrderEntity);
return ResultVOUtils.success();
}

4
src/main/java/com/glxp/api/service/purchase/SupProductService.java
Unescape Escape View File

@ -18,7 +18,7 @@ public interface SupProductService extends IService<SupProductEntity> {
SupProductEntity findByRelIdFk(String relIdFk);
SupProductEntity findByManufactury(String cpmctymc, String manufactory,String manufacturerIdFk);
SupProductEntity findByManufactury(String cpmctymc, String manufactory, String manufacturerIdFk);
SupProductResponse findByPassByReCert(String registerCert);
@ -34,6 +34,8 @@ public interface SupProductService extends IService<SupProductEntity> {
boolean insertRegistration(SupProductEntity supProductEntity);
int findProduct(SupProductEntity supProductEntity);
boolean deleteById(@Param("id") String id);
boolean deleteByEnterpriseId(@Param("enterpriseId") String enterpriseId);

4
src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java
Unescape Escape View File

@ -143,6 +143,10 @@ public class SupProductServiceImpl extends ServiceImpl<SupProductDao, SupProduct
return supProductDao.insert(companyEntity) > 0 ? true : false;
}
@Override
public int findProduct(SupProductEntity supProductEntity) {
return supProductDao.findProduct(supProductEntity);
}
@Override
public boolean deleteById(String id) {
return supProductDao.deleteById(id);

88
src/main/java/com/glxp/api/task/TestStatOrderService.java
Unescape Escape View File

@ -0,0 +1,88 @@
package com.glxp.api.task;
import com.glxp.api.service.inout.IoStatDayService;
import com.glxp.api.service.inout.IoStatMonthService;
import com.glxp.api.service.inout.IoStatQuarterService;
import com.glxp.api.service.inout.IoStatYearService;
import com.glxp.api.util.MsDateUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Date;
@Slf4j
@Service
public class TestStatOrderService {
@Resource
private IoStatDayService statDayService;
@Resource
private IoStatMonthService statMonthService;
@Resource
private IoStatQuarterService statQuarterService;
@Resource
private IoStatYearService statYearService;
public void starGen(Long starTime) {
if (starTime == null) {
starTime = 1684252800000L;
}
Long oneDay = 1000 * 60 * 60 * 24L;//One Day TimeStamp
Long endTime = new Date().getTime();
while (starTime <= endTime) {
Date today = new Date(starTime);
genStat(today);
starTime += oneDay;
}
}
public void genStat(Date today) {
if (MsDateUtil.isYearStart(today)) {
//年初第一天，依次生成 日 -> 月 -> 季度 -> 年度 汇总数据
log.info("开始生成每日物资出入库汇总数据");
statDayService.statData(today);
log.info("每日物资出入库数据汇总生成结束");
log.info("本日为月初，生成月度物资出入库汇总数据");
statMonthService.statData(today);
log.info("月度物资出入库汇总数据生成结束");
log.info("本日为季初，生成季度物资出入库汇总数据");
statQuarterService.statData(today);
log.info("季度物资出入库汇总数据生成结束");
log.info("本日为年初，生成年度物资出入库汇总数据");
statYearService.statData(today);
log.info("年度物资出入库汇总数据生成结束");
} else if (MsDateUtil.isQuarterStart(today)) {
//季度第一天，依次生成 日 -> 月 -> 季度 汇总数据
log.info("开始生成每日物资出入库汇总数据");
statDayService.statData(today);
log.info("每日物资出入库数据汇总生成结束");
log.info("本日为月初，生成月度物资出入库汇总数据");
statMonthService.statData(today);
log.info("月度物资出入库汇总数据生成结束");
log.info("本日为季初，生成季度物资出入库汇总数据");
statQuarterService.statData(today);
log.info("季度物资出入库汇总数据生成结束");
} else if (MsDateUtil.isMonthStart(today)) {
//月度第一天，依次生成 日 -> 月 汇总数据
log.info("开始生成每日物资出入库汇总数据");
statDayService.statData(today);
log.info("每日物资出入库数据汇总生成结束");
log.info("本日为月初，生成月度物资出入库汇总数据");
statMonthService.statData(today);
log.info("月度物资出入库汇总数据生成结束");
} else {
//生成日汇总数据
log.info("开始生成每日物资出入库汇总数据");
statDayService.statData(today);
log.info("每日物资出入库数据汇总生成结束");
}
}
}

2
src/main/resources/application-dev.yml
Unescape Escape View File

@ -4,7 +4,7 @@ server:
spring:
datasource:
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_zyy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root
password: 123456
hikari:

28
src/main/resources/mybatis/mapper/inv/DeviceProjectSetMapper.xml
Unescape Escape View File

@ -18,4 +18,30 @@
<!--@mbg.generated-->
id, code, content, `type`, remak, udpateTime, updateUser, `createUser`, createTime
</sql>
</mapper>
<select id="filterList" resultType="com.glxp.api.res.inv.DeviceProjectSetResponse">
select device_project_set.*,
(select employeeName from auth_user where device_project_set.updateUser=auth_user.id) as updateUserName,
(select employeeName from auth_user where device_project_set.createUser=auth_user.id) as createUserName
from device_project_set
<where>
<if test="type != null">
AND type = #{type}
</if>
<if test="code != null and code != ''">
AND code like concat('%',#{code},'%')
</if>
<if test="content != null and content != ''">
AND content like concat('%',#{content},'%')
</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND date_format(udpateTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and
date_format(#{endTime}, '%Y-%m-%d')
</if>
</where>
</select>
</mapper>

21
src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDao.xml
Unescape Escape View File

@ -13,17 +13,27 @@
t.deptCode,
t.invCode,
t.code,
t.status,
t.`status`,
t.createUser,
t.auditUser,
t.msg,
t.createTime,
t.auditTime,
t.remark,
t.repairType,
t.urgencyType,
t.planTime,
t.uploadImage,
t.repariStartTime,
t.repariEndTime,
t.repariName,
t.repariImage,
t.repariRemark,
(select employeeName from auth_user where id = t.createUser) createUserName,
(select employeeName from auth_user where id = t.auditUser) auditUserName,
(select `name` from auth_dept where code = t.deptCode) deptName,
(select `name` from auth_warehouse where code = t.invCode) invName,
(select employeeName from auth_user where id = t.repariName) repName,
t1.deviceName,
t1.ggxh,
t1.batchNo
@ -39,12 +49,21 @@
<if test="invCode != null and invCode != ''">
AND t.invCode = #{invCode}
</if>
<if test="repariName != null and repariName != ''">
AND t.repariName = #{repariName}
</if>
<if test="code != null and code != ''">
AND t.code like concat('%', #{code}, '%')
</if>
<if test="status != null">
AND t.status = #{status}
</if>
<if test="statusList != null and statusList.size >0">
and t.status in
<foreach collection="statusList" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</where>
</select>
</mapper>

14
src/main/resources/mybatis/mapper/purchase/SupProductDao.xml
Unescape Escape View File

@ -389,4 +389,18 @@
FROM sup_product
WHERE enterpriseId = #{enterpriseId}
</delete>
<select id="findProduct" parameterType="com.glxp.api.entity.purchase.SupProductEntity"
resultType="java.lang.Integer" >
SELECT count(*)
FROM sup_product
inner join sup_company
on sup_product.customerId = sup_company.customerId
INNER JOIN sup_manufacturer
on sup_manufacturer.manufacturerId =
sup_product.manufacturerIdFk
WHERE sup_manufacturer.companyName=(SELECT companyName FROM sup_manufacturer WHERE manufacturerId = #{manufacturerIdFk})
and recordCode=#{recordCode} and recordProductName=#{recordProductName}
</select>
</mapper>

12
src/main/resources/schemas/schema_v2.2.sql
Unescape Escape View File

@ -65,15 +65,15 @@ CREATE TABLE IF NOT EXISTS `device_project_set`
SET FOREIGN_KEY_CHECKS = 1;
CALL Pro_Temp_ColumnWork('device_repair_order', 'repairType', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('device_repair_order', 'repairType', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('device_repair_order', 'urgencyType', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('device_repair_order', 'planTime', 'datetime', 1);
CALL Pro_Temp_ColumnWork('device_repair_order', 'uploadImage', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('device_repair_order', 'uploadImage', 'text', 1);
CALL Pro_Temp_ColumnWork('device_repair_order', 'repariName', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('device_repair_order', 'reparistartTime', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('device_repair_order', 'repariEndTime', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('device_repair_order', 'reparistartTime', 'datetime', 1);
CALL Pro_Temp_ColumnWork('device_repair_order', 'repariEndTime', 'datetime', 1);
CALL Pro_Temp_ColumnWork('device_repair_order', 'repariRemark', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('device_repair_order', 'repariImage', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('device_repair_order', 'repariImage', 'text', 1);
CALL Pro_Temp_ColumnWork('device_inspect_plan', 'startTime', 'datetime', 1);
CALL Pro_Temp_ColumnWork('device_inspect_plan', 'endTime', 'datetime', 1);
@ -82,4 +82,4 @@ CALL Pro_Temp_ColumnWork('device_inspect_plan', 'frequencyUnit', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('device_inspect_plan', 'planStatus', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('device_inspect_plan', 'inspectUser', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('device_inspect_plan', 'lastTime', 'datetime', 1);
CALL Pro_Temp_ColumnWork('device_inspect_plan', 'nextTime', 'datetime', 1);
CALL Pro_Temp_ColumnWork('device_inspect_plan', 'nextTime', 'datetime', 1);

Write Preview
Loading…
Cancel
Save