修改一些小问题

jeecg-boot-module-system/src/main/java/org/jeecg/JeecgSystemApplication.java

@@ -8,6 +8,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
+import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -18,6 +19,7 @@ import java.net.UnknownHostException;
 
 @Slf4j
 @SpringBootApplication
+@ServletComponentScan
 public class JeecgSystemApplication extends SpringBootServletInitializer {
 
     @Override

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/PurchaseorderController.java

 package org.jeecg.modules.iost.API.controller;
 
 import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.alibaba.fastjson.JSONObject;
-import org.apache.poi.ss.formula.functions.T;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -26,21 +15,11 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.iost.API.entity.Purchaseorder;
 import org.jeecg.modules.iost.API.lanjieqi.Lanjieqi_API;
 import org.jeecg.modules.iost.API.service.IPurchaseorderService;
-import org.jeecg.modules.iost.API.vo.PageInfo;
-import org.jeecg.modules.iost.API.vo.PurchaseordeRequest;
 import org.jeecg.modules.iost.API.vo.Request;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -71,7 +50,7 @@ public class PurchaseorderController extends JeecgController<Purchaseorder, IPur
 	 */
 	@AutoLog(value = "采购订单接口-分页列表查询")
 	@ApiOperation(value="采购订单接口-分页列表查询", notes="采购订单接口-分页列表查询")
-	@GetMapping(value = "")
+	@GetMapping(value = "list")
 	public Request<?> queryPageList(Purchaseorder purchaseorder,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/ReservestockApiController.java

@@ -46,7 +46,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  */
 @Api(tags="国网备品备件库存API")
 @RestController
-@RequestMapping("/API/eip_spare_product ")
+@RequestMapping("/API/eip_spare_product")
 @Slf4j
 public class ReservestockApiController extends JeecgController<ReservestockApi, IReservestockApiService> {
 	@Autowired
@@ -68,10 +68,10 @@ public class ReservestockApiController extends JeecgController<ReservestockApi,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		String jieguo= Lanjieqi_API.Panduan(req);
+		/*String jieguo= Lanjieqi_API.Panduan(req);
 		if (jieguo!=null){
 			return Request.error10001(jieguo);
-		}
+		}*/
 		QueryWrapper<ReservestockApi> queryWrapper = QueryGenerator.initQueryWrapper(reservestockApi, req.getParameterMap());
 		Page<ReservestockApi> page = new Page<ReservestockApi>(pageNo, pageSize);
 		IPage<ReservestockApi> pageList = reservestockApiService.page(page, queryWrapper);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/entity/ReservestockApi.java

@@ -67,6 +67,8 @@ public class ReservestockApi implements Serializable {
 	@Excel(name = "数据来源", width = 15)
     @ApiModelProperty(value = "数据来源")
     private String datasource;
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	/**来源数据创建时间*/
 	@Excel(name = "来源数据创建时间", width = 15)
     @ApiModelProperty(value = "来源数据创建时间")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/mapper/PhysicalidApiMapper.java

@@ -13,5 +13,4 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @Version: V1.0
  */
 public interface PhysicalidApiMapper extends BaseMapper<PhysicalidApi> {
-
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/servlets/LoginServlet.java

 package org.jeecg.modules.iost.API.servlets;
 
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.filter.OncePerRequestFilter;
 
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebFilter;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -18,6 +21,7 @@ import java.util.Map;
  * 返回请求时增加响应头的属性
  */
 @Component
+@WebFilter(urlPatterns = "/API/")
 public class LoginServlet extends OncePerRequestFilter {
     @Override
     protected void doFilterInternal(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, FilterChain filterChain) throws ServletException, IOException {
@@ -25,16 +29,18 @@ public class LoginServlet extends OncePerRequestFilter {
         while (enumeration.hasMoreElements()) {
             String headerName = (String) enumeration.nextElement();
             String headValue = httpServletRequest.getHeader(headerName);
-            if (headerName.equals("orisys")){
-                httpServletResponse.addHeader("orisys",headValue);
+            if (headerName.equals("orisys")) {
+                httpServletResponse.addHeader("orisys", headValue);
             }
-            if (headerName.equals("transno")){
-                httpServletResponse.addHeader("transno",headValue);
+            if (headerName.equals("transno")) {
+                httpServletResponse.addHeader("transno", headValue);
             }
-            if (headerName.equals("operatetype")){
-                httpServletResponse.addHeader("operatetype",headValue);
+            if (headerName.equals("operatetype")) {
+                httpServletResponse.addHeader("operatetype", headValue);
             }
-        }
 
+        }
+        filterChain.doFilter(httpServletRequest, httpServletResponse);
     }
 }
+

jeecg-boot-module-system/src/main/resources/application-docker.yml

@@ -3,7 +3,7 @@ server:
   tomcat:
     max-swallow-size: -1
   servlet:
-    context-path:
+    context-path: /wmssystem
   compression:
     enabled: true
     min-response-size: 1024

jeecg-boot-module-system/src/main/resources/application-test.yml

 server:
-  port: 8080
+  port: 8090
   tomcat:
     max-swallow-size: -1
   servlet:

jeecg-boot-module-system/target/classes/application-docker.yml

@@ -3,7 +3,7 @@ server:
   tomcat:
     max-swallow-size: -1
   servlet:
-    context-path:
+    context-path: /wmssystem
   compression:
     enabled: true
     min-response-size: 1024

jeecg-boot-module-system/target/classes/application-test.yml

 server:
-  port: 8080
+  port: 8090
   tomcat:
     max-swallow-size: -1
   servlet: