EMPT / location · 提交

转到一个项目

作者 shenhailong
提交 e119812d254be1815ac275992d04a99d1b7109e7 1 个父辈 88419054

..........

内嵌 并排对比
正在显示 6 个修改的文件 包含 22 行增加 和 47 行删除
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 2 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3 - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 3 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4 <modelVersion>4.0.0</modelVersion> 4 <modelVersion>4.0.0</modelVersion>
5 <parent> 5 <parent>
6 <groupId>org.springframework.boot</groupId> 6 <groupId>org.springframework.boot</groupId>
@@ -79,30 +79,26 @@ @@ -79,30 +79,26 @@
79 <artifactId>spring-boot-starter-test</artifactId> 79 <artifactId>spring-boot-starter-test</artifactId>
80 <scope>test</scope> 80 <scope>test</scope>
81 </dependency> 81 </dependency>
82 -<<<<<<< Updated upstream  
83 - <dependency>  
84 - <groupId>com.tianbo</groupId>  
85 - <artifactId>util</artifactId>  
86 - <version>1.0-SNAPSHOT</version>  
87 - </dependency>  
88 -=======  
89 - <!--<dependency>-->  
90 - <!--<groupId>com.tianbo</groupId>-->  
91 - <!--<artifactId>util</artifactId>-->  
92 - <!--<version>1.0-SNAPSHOT</version>-->  
93 - <!--</dependency>-->  
94 ->>>>>>> Stashed changes  
95 <dependency> 82 <dependency>
96 <groupId>net.sf.json-lib</groupId> 83 <groupId>net.sf.json-lib</groupId>
97 <artifactId>json-lib</artifactId> 84 <artifactId>json-lib</artifactId>
98 <version>2.4</version> 85 <version>2.4</version>
99 <classifier>jdk15</classifier> 86 <classifier>jdk15</classifier>
100 </dependency> 87 </dependency>
101 - <!--<dependency>-->  
102 - <!--<groupId>com.fasterxml.jackson.core</groupId>-->  
103 - <!--<artifactId>jackson-core</artifactId>-->  
104 - <!--<version>2.9.5</version>-->  
105 - <!--</dependency>--> 88 +
  89 + <dependency>
  90 + <groupId>net.sf.json-lib</groupId>
  91 + <artifactId>json-lib</artifactId>
  92 + <version>2.4</version>
  93 + <classifier>jdk15</classifier>
  94 + </dependency>
  95 +
  96 + <dependency>
  97 + <groupId>net.sf.json-lib</groupId>
  98 + <artifactId>json-lib</artifactId>
  99 + <version>2.4</version>
  100 + <classifier>jdk15</classifier>
  101 + </dependency>
106 <!--集成swagger2，下面两个spring的配置解决springboot包 与swagger2的包冲突问题，生产部署的时候记得要去掉此swagger2的配置，开发环境开启--> 102 <!--集成swagger2，下面两个spring的配置解决springboot包 与swagger2的包冲突问题，生产部署的时候记得要去掉此swagger2的配置，开发环境开启-->
107 <!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger-ui --> 103 <!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger-ui -->
108 <dependency> 104 <dependency>
@@ -205,6 +201,7 @@ @@ -205,6 +201,7 @@
205 </execution> 201 </execution>
206 </executions> 202 </executions>
207 </plugin> 203 </plugin>
  204 +
208 <plugin> 205 <plugin>
209 <artifactId>maven-antrun-plugin</artifactId> 206 <artifactId>maven-antrun-plugin</artifactId>
210 <executions> 207 <executions>
@@ -222,7 +219,7 @@ @@ -222,7 +219,7 @@
222 </execution> 219 </execution>
223 </executions> 220 </executions>
224 </plugin> 221 </plugin>
  222 +
225 </plugins> 223 </plugins>
226 </build> 224 </build>
227 -  
228 </project> 225 </project>
@@ -9,7 +9,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; @@ -9,7 +9,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
9 @SpringBootApplication() 9 @SpringBootApplication()
10 @EnableScheduling 10 @EnableScheduling
11 @MapperScan("com.sunyo.energy.location.dao") 11 @MapperScan("com.sunyo.energy.location.dao")
12 -@ComponentScan("com.sunyo.energy.location") 12 +//@ComponentScan("com.sunyo.energy.location")
13 public class BootApplication { 13 public class BootApplication {
14 14
15 public static void main(String[] args) { 15 public static void main(String[] args) {
1 package com.sunyo.energy.location.controller; 1 package com.sunyo.energy.location.controller;
2 2
3 -import com.github.pagehelper.Page;  
4 -import com.github.pagehelper.PageHelper;  
5 -import com.github.pagehelper.PageInfo;  
6 -import com.sunyo.energy.location.controller.response.ResultJson;  
7 -import com.sunyo.energy.location.dao.WaterMeterMapper;  
8 -import com.sunyo.energy.location.model.Location;  
9 -import com.sunyo.energy.location.model.WaterElectricityParameter;  
10 import com.sunyo.energy.location.model.WaterMeter; 3 import com.sunyo.energy.location.model.WaterMeter;
11 import com.sunyo.energy.location.service.WaterMeterService; 4 import com.sunyo.energy.location.service.WaterMeterService;
12 import io.swagger.annotations.ApiOperation; 5 import io.swagger.annotations.ApiOperation;
13 import org.springframework.beans.factory.annotation.Autowired; 6 import org.springframework.beans.factory.annotation.Autowired;
14 import org.springframework.stereotype.Controller; 7 import org.springframework.stereotype.Controller;
15 import org.springframework.web.bind.annotation.RequestMapping; 8 import org.springframework.web.bind.annotation.RequestMapping;
16 -import org.springframework.web.bind.annotation.RequestMethod;  
17 import org.springframework.web.bind.annotation.RequestParam; 9 import org.springframework.web.bind.annotation.RequestParam;
18 import org.springframework.web.bind.annotation.ResponseBody; 10 import org.springframework.web.bind.annotation.ResponseBody;
19 11
@@ -36,11 +28,4 @@ public class WaterMeterController { @@ -36,11 +28,4 @@ public class WaterMeterController {
36 } 28 }
37 29
38 30
39 -// @RequestMapping("/findRealTimes")  
40 -// @ResponseBody  
41 -// public void findRealTimes(){  
42 -//  
43 -// waterMeterService.realTime();  
44 -// }  
45 -  
46 } 31 }
1 package com.sunyo.energy.location.service; 1 package com.sunyo.energy.location.service;
2 2
3 -import com.github.pagehelper.PageInfo;  
4 -import com.sunyo.energy.location.model.PayRecords; 3 + import com.github.pagehelper.PageInfo;
  4 + import com.sunyo.energy.location.model.PayRecords;
5 5
6 /** 6 /**
7 * Created by XYH on 2019/12/16. 7 * Created by XYH on 2019/12/16.
@@ -31,13 +31,6 @@ public class PayOrderImpl implements PayOrderService { @@ -31,13 +31,6 @@ public class PayOrderImpl implements PayOrderService {
31 31
32 Page<PayRecords> page = PageHelper.startPage(pageNum,pageSize); 32 Page<PayRecords> page = PageHelper.startPage(pageNum,pageSize);
33 33
34 - if (StringUtils.isEmpty(orderNumber)){  
35 -  
36 - }else if (!orderNumber.contains("-")){  
37 - StringBuffer stringBuffer = new StringBuffer(orderNumber);  
38 - orderNumber = stringBuffer.insert(3, "-").toString();  
39 - }  
40 -  
41 if (!StringUtils.isEmpty(payTime) && !payTime.contains("undefined")){ 34 if (!StringUtils.isEmpty(payTime) && !payTime.contains("undefined")){
42 String[] split = payTime.split(","); 35 String[] split = payTime.split(",");
43 startTime = split[0].toString(); 36 startTime = split[0].toString();
@@ -6,8 +6,8 @@ docker: @@ -6,8 +6,8 @@ docker:
6 ip: 192.168.1.63 6 ip: 192.168.1.63
7 server: 7 server:
8 port: 10003 8 port: 10003
9 - servlet:  
10 - context-path: ${SERVER_CONTEXTPATH:} 9 +# servlet:
  10 +# context-path: ${SERVER_CONTEXTPATH:}
11 spring: 11 spring:
12 profiles: 12 profiles:
13 active: dev 13 active: dev