Compare commits
6 Commits
21fb65c83f
...
a88c8e1cf4
| Author | SHA1 | Date |
|---|---|---|
 xd
|
a88c8e1cf4 | |
|
xd
|
a0407bb2e6 | |
|
xd
|
7a7d8dff98 | |
|
xd
|
2a33beef82 | |
|
xd
|
4fa81787b9 | |
|
xd
|
0b76f1867c |
|
|
@ -540,6 +540,29 @@ Caused by: org.springframework.context.annotation.ConflictingBeanDefinitionExcep
|
|||
2024-02-26 09:08:12.703 INFO 4784 --- [http-nio-3333-exec-9] com.JN.filter.LoginCheckFilter : 本次请求/plugins/axios/axios.min.map不需要处理
|
||||
2024-02-26 09:08:12.739 INFO 4784 --- [http-nio-3333-exec-10] com.JN.filter.LoginCheckFilter : 拦截到请求：/zmquotation/inventoryList
|
||||
2024-02-26 09:08:12.739 INFO 4784 --- [http-nio-3333-exec-10] com.JN.filter.LoginCheckFilter : 本次请求/zmquotation/inventoryList不需要处理
|
||||
<<<<<<< HEAD
|
||||
2024-02-26 09:12:12.019 INFO 11140 --- [main] com.JN.JNApplication : Starting JNApplication using Java 1.8.0_171 on xudong with PID 11140 (E:\myproject\JNDemo\target\classes started by Administrator in E:\myproject\JNDemo)
|
||||
2024-02-26 09:12:12.021 INFO 11140 --- [main] com.JN.JNApplication : The following profiles are active: ZM
|
||||
2024-02-26 09:12:13.751 WARN 11140 --- [Druid-ConnectionPool-Create-999699153] c.m.s.jdbc.internals.TDS.Channel : TLSv1 was negotiated. Please update server and client to use TLSv1.2 at minimum.
|
||||
2024-02-26 09:12:14.692 INFO 11140 --- [main] com.JN.config.WebMvcConfig : 扩展消息转换器...
|
||||
2024-02-26 09:12:14.698 INFO 11140 --- [main] com.JN.config.WebMvcConfig : 开始进行静态资源映射...
|
||||
2024-02-26 09:12:14.805 WARN 11140 --- [main] JpaBaseConfiguration$JpaWebConfiguration : spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning
|
||||
2024-02-26 09:12:15.003 INFO 11140 --- [main] com.JN.JNApplication : Started JNApplication in 3.426 seconds (JVM running for 4.131)
|
||||
2024-02-26 09:12:15.008 INFO 11140 --- [main] com.JN.JNApplication : 项目启动成功...
|
||||
2024-02-26 09:12:20.404 INFO 11140 --- [http-nio-3333-exec-1] com.JN.filter.LoginCheckFilter : 拦截到请求：/JN
|
||||
2024-02-26 09:12:20.405 INFO 11140 --- [http-nio-3333-exec-1] com.JN.filter.LoginCheckFilter : 本次请求/JN不需要处理
|
||||
2024-02-26 09:12:20.933 INFO 11140 --- [http-nio-3333-exec-3] com.JN.filter.LoginCheckFilter : 拦截到请求：/plugins/axios/axios.min.map
|
||||
2024-02-26 09:12:20.933 INFO 11140 --- [http-nio-3333-exec-3] com.JN.filter.LoginCheckFilter : 本次请求/plugins/axios/axios.min.map不需要处理
|
||||
2024-02-26 09:12:20.934 INFO 11140 --- [http-nio-3333-exec-2] com.JN.filter.LoginCheckFilter : 拦截到请求：/plugins/calendar/js-calendar-converter.js.map
|
||||
2024-02-26 09:12:20.935 INFO 11140 --- [http-nio-3333-exec-2] com.JN.filter.LoginCheckFilter : 本次请求/plugins/calendar/js-calendar-converter.js.map不需要处理
|
||||
2024-02-26 09:12:21.016 INFO 11140 --- [http-nio-3333-exec-4] com.JN.filter.LoginCheckFilter : 拦截到请求：/zmquotation/inventoryList
|
||||
2024-02-26 09:12:21.017 INFO 11140 --- [http-nio-3333-exec-4] com.JN.filter.LoginCheckFilter : 本次请求/zmquotation/inventoryList不需要处理
|
||||
2024-02-26 09:12:21.118 INFO 11140 --- [http-nio-3333-exec-5] com.JN.filter.LoginCheckFilter : 拦截到请求：/static/image/JNlogo.png
|
||||
2024-02-26 09:12:21.118 INFO 11140 --- [http-nio-3333-exec-5] com.JN.filter.LoginCheckFilter : 本次请求/static/image/JNlogo.png不需要处理
|
||||
2024-02-26 09:12:30.447 INFO 11140 --- [http-nio-3333-exec-9] com.JN.filter.LoginCheckFilter : 拦截到请求：/zmquotation/regionList
|
||||
2024-02-26 09:12:30.447 INFO 11140 --- [http-nio-3333-exec-9] com.JN.filter.LoginCheckFilter : 本次请求/zmquotation/regionList不需要处理
|
||||
2024-02-26 09:12:30.650 INFO 11140 --- [http-nio-3333-exec-9] c.J.d.z.controller.ZMController : 查询到的地区列表结果是：[RegionDto(province=江苏省, city=无锡市, district=滨湖区, kilometers=86, price01=1.4600, price02=1.4600, price03=1.4600, price04=1.4600, price05=1.4600), RegionDto(province=江苏省, city=无锡市, district=惠山区, kilometers=76, price01=1.4600, price02=1.4600, price03=1.4600, price04=1.4600, price05=1.4600), RegionDto(province=江苏省, city=无锡市, district=梁溪区, kilometers=75, price01=1.4600, price02=1.4600, price03=1.4600, price04=1.4600, price05=1.4600), RegionDto(province=江苏省, city=无锡市, district=锡山区, kilometers=79, price01=1.4600, price02=1.4600, price03=1.4600, price04=1.4600, price05=1.4600), RegionDto(province=江苏省, city=无锡市, district=新吴区, kilometers=91, price01=1.4600, price02=1.4600, price03=1.4600, price04=1.4600, price05=1.4600)]
|
||||
=======
|
||||
2024-02-26 09:11:21.327 INFO 6236 --- [main] com.JN.JNApplication : Starting JNApplication using Java 1.8.0_171 on DESKTOP-OG1MRMC with PID 6236 (D:\JavaProject\JNDemo\target\classes started by Administrator in D:\JavaProject\JNDemo)
|
||||
2024-02-26 09:11:21.343 INFO 6236 --- [main] com.JN.JNApplication : The following profiles are active: ZM
|
||||
2024-02-26 09:11:23.326 WARN 6236 --- [Druid-ConnectionPool-Create-162320368] c.m.s.jdbc.internals.TDS.Channel : TLSv1 was negotiated. Please update server and client to use TLSv1.2 at minimum.
|
||||
|
|
@ -564,3 +587,4 @@ Caused by: org.springframework.context.annotation.ConflictingBeanDefinitionExcep
|
|||
2024-02-26 09:11:46.660 INFO 6236 --- [http-nio-3333-exec-7] com.JN.filter.LoginCheckFilter : 本次请求/plugins/axios/axios.min.map不需要处理
|
||||
2024-02-26 09:11:46.721 INFO 6236 --- [http-nio-3333-exec-4] com.JN.filter.LoginCheckFilter : 拦截到请求：/zmquotation/inventoryList
|
||||
2024-02-26 09:11:46.721 INFO 6236 --- [http-nio-3333-exec-4] com.JN.filter.LoginCheckFilter : 本次请求/zmquotation/inventoryList不需要处理
|
||||
>>>>>>> 21fb65c83fe6bc738a699e566d5691cb441ad751
|
||||
|
|
|
|||
|
|
@ -15,11 +15,6 @@ import java.util.List;
|
|||
*/
|
||||
@Mapper
|
||||
public interface JnRegionMapper {
|
||||
@Select("with temp as(\n" +
|
||||
"select pz_place_uid_0,price_0t_5t,price_5t_10t,price_10t_25t,price_25t_100t,price_100t from c_pz_price where date_0=(select max(date_0) from c_pz_price) \n" +
|
||||
") select distinct a.sheng_0 as province,a.shi_0 as city,a.qu_0 as district,a.km_0 as kilometers,\n" +
|
||||
"b.price_0t_5t as price_01,b.price_5t_10t as price_02,b.price_10t_25t as price_03,b.price_25t_100t as price_04,b.price_100t as price_05\n" +
|
||||
"from c_pz_place2019 a left join temp b on a.id_0 = b.pz_place_uid_0 where a.qu_0 not in \n" +
|
||||
"('江阴市','金坛区','溧阳市','宜兴市') and (sheng_0 like '%${regionName}%' or shi_0 like '%${regionName}%' or qu_0 like '%${regionName}%')")
|
||||
@Select("select * from c_place a where 1=1 and a.province like '%${regionName}%' or a.city like '%${regionName}%' or a.district like '%${regionName}%' ")
|
||||
List<JnRegionDto> queryRegionListByName(String regionName);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ spring:
|
|||
datasource:
|
||||
master:
|
||||
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
|
||||
url: jdbc:sqlserver://192.168.9.230:1433;databaseName=ERP;Encrypt=false;TrustServerCertificate=true;
|
||||
url: jdbc:sqlserver://192.168.9.99:1433;databaseName=jn_quot;Encrypt=false;TrustServerCertificate=true;
|
||||
username: sa
|
||||
password: Itcenter110-
|
||||
slave_1:
|
||||
|
|
|
|||
|
|
@ -2,4 +2,4 @@ spring:
|
|||
thymeleaf:
|
||||
mode: HTML
|
||||
profiles:
|
||||
active: ZM
|
||||
active: JN
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
const queryRegionListByName = (params) => {
|
||||
return $axios({
|
||||
url: '/zmquotation/regionList',
|
||||
url: '/jnquotation/regionList',
|
||||
method: 'post',
|
||||
params
|
||||
})
|
||||
|
|
|
|||
|
|
@ -591,6 +591,7 @@
|
|||
}
|
||||
console.log(params)
|
||||
queryRegionListByName(params).then(res => {
|
||||
console.log('queryRegionListByName')
|
||||
this.regionTableData = res.data || []
|
||||
this.regionCurrentPage = 1;
|
||||
}).catch(err => {
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -11,7 +11,7 @@ spring:
|
|||
datasource:
|
||||
master:
|
||||
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
|
||||
url: jdbc:sqlserver://192.168.9.230:1433;databaseName=ERP;Encrypt=false;TrustServerCertificate=true;
|
||||
url: jdbc:sqlserver://192.168.9.99:1433;databaseName=jn_quot;Encrypt=false;TrustServerCertificate=true;
|
||||
username: sa
|
||||
password: Itcenter110-
|
||||
slave_1:
|
||||
|
|
|
|||
|
|
@ -2,4 +2,4 @@ spring:
|
|||
thymeleaf:
|
||||
mode: HTML
|
||||
profiles:
|
||||
active: ZM
|
||||
active: JN
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,6 +1,6 @@
|
|||
const queryRegionListByName = (params) => {
|
||||
return $axios({
|
||||
url: '/zmquotation/regionList',
|
||||
url: '/jnquotation/regionList',
|
||||
method: 'post',
|
||||
params
|
||||
})
|
||||
|
|
|
|||
|
|
@ -591,6 +591,7 @@
|
|||
}
|
||||
console.log(params)
|
||||
queryRegionListByName(params).then(res => {
|
||||
console.log('queryRegionListByName')
|
||||
this.regionTableData = res.data || []
|
||||
this.regionCurrentPage = 1;
|
||||
}).catch(err => {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
artifactId=JNDemo
|
||||
groupId=com.JN
|
||||
version=1.0-SNAPSHOT
|
||||
|
|
@ -0,0 +1,58 @@
|
|||
com\JN\demo\zmquotation\dto\RegionDto.class
|
||||
com\JN\config\MybatisPlusConfig.class
|
||||
com\JN\demo\jnzmquatation\dto\JnRegionDto.class
|
||||
com\JN\controller\PageRedirectController.class
|
||||
com\JN\demo\zmquotation\service\impl\InventoryServiceImpl.class
|
||||
com\JN\demo\jnzmquatation\service\impl\JnInventoryServiceImpl.class
|
||||
com\JN\service\impl\EmployeeServiceImpl.class
|
||||
com\JN\utils\HttpHelper$1.class
|
||||
com\JN\common\BaseContext.class
|
||||
com\JN\demo\bizquery\service\impl\QccInfoServiceImpl.class
|
||||
com\JN\demo\jnzmquatation\service\impl\JnMaterialServiceImpl.class
|
||||
com\JN\demo\bizquery\controller\BizQccController.class
|
||||
com\JN\service\EmployeeService.class
|
||||
com\JN\demo\zmquotation\dto\InventoryDto.class
|
||||
com\JN\utils\StringUtils.class
|
||||
com\JN\demo\bizquery\mapper\QccInfoMapper.class
|
||||
com\JN\demo\jnzmquatation\controller\JNController.class
|
||||
com\JN\common\GlobalExceptionHandler.class
|
||||
com\JN\demo\jnzmquatation\service\JnInventoryService.class
|
||||
com\JN\demo\zmquotation\service\impl\MaterialServiceImpl.class
|
||||
com\JN\demo\bizquery\service\QccInfoService.class
|
||||
com\JN\config\WebMvcConfig.class
|
||||
com\JN\demo\bizquery\service\impl\BizServiceImpl.class
|
||||
com\JN\demo\bizquery\dto\BizDto.class
|
||||
com\JN\demo\zmquotation\service\MaterialService.class
|
||||
com\JN\common\CustomException.class
|
||||
com\JN\common\R.class
|
||||
com\JN\demo\jnzmquatation\dto\JnInventoryDto.class
|
||||
com\JN\demo\bizquery\service\BizService.class
|
||||
com\JN\filter\LoginCheckFilter.class
|
||||
com\JN\API\qichacha\QccApiUntils.class
|
||||
com\JN\demo\zmquotation\service\InventoryService.class
|
||||
com\JN\demo\jnzmquatation\dto\JnMaterialDto.class
|
||||
com\JN\demo\bizquery\controller\BizController.class
|
||||
com\JN\demo\zmquotation\mapper\InventoryMapper.class
|
||||
com\JN\utils\SMSUtils.class
|
||||
com\JN\demo\bizquery\mapper\BizMapper.class
|
||||
com\JN\demo\jnzmquatation\service\JnRegionService.class
|
||||
com\JN\utils\ValidateCodeUtils.class
|
||||
com\JN\API\qichacha\QccApiUntils$HttpCodeRegex.class
|
||||
com\JN\utils\HttpHelper.class
|
||||
com\JN\common\MyMetaObjecthandler.class
|
||||
com\JN\demo\jnzmquatation\mapper\JnMaterialMapper.class
|
||||
com\JN\JNApplication.class
|
||||
com\JN\demo\zmquotation\dto\MaterialDto.class
|
||||
com\JN\demo\zmquotation\mapper\MaterialMapper.class
|
||||
com\JN\demo\jnzmquatation\mapper\JnRegionMapper.class
|
||||
com\JN\demo\jnzmquatation\service\JnMaterialService.class
|
||||
com\JN\demo\jnzmquatation\mapper\JnInventoryMapper.class
|
||||
com\JN\demo\zmquotation\mapper\RegionMapper.class
|
||||
com\JN\demo\jnzmquatation\service\impl\JnRegionServiceImpl.class
|
||||
com\JN\demo\zmquotation\controller\ZMController.class
|
||||
com\JN\demo\zmquotation\service\impl\RegionServiceImpl.class
|
||||
com\JN\demo\bizquery\entity\QccInfo.class
|
||||
com\JN\demo\zmquotation\service\RegionService.class
|
||||
com\JN\mapper\EmployeeMapper.class
|
||||
com\JN\common\JacksonObjectMapper.class
|
||||
com\JN\utils\JSONHelper.class
|
||||
|
|
@ -0,0 +1,56 @@
|
|||
E:\myproject\JNDemo\src\main\java\com\JN\demo\jnzmquatation\service\impl\JnMaterialServiceImpl.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\jnzmquatation\service\JnMaterialService.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\jnzmquatation\dto\JnInventoryDto.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\bizquery\controller\BizQccController.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\bizquery\service\BizService.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\zmquotation\mapper\RegionMapper.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\mapper\EmployeeMapper.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\jnzmquatation\dto\JnRegionDto.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\filter\LoginCheckFilter.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\config\MybatisPlusConfig.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\jnzmquatation\mapper\JnInventoryMapper.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\utils\JSONHelper.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\controller\PageRedirectController.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\zmquotation\dto\InventoryDto.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\jnzmquatation\service\JnRegionService.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\zmquotation\service\InventoryService.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\zmquotation\dto\RegionDto.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\bizquery\mapper\BizMapper.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\zmquotation\service\MaterialService.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\API\qichacha\QccApiUntils.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\zmquotation\service\impl\MaterialServiceImpl.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\bizquery\service\QccInfoService.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\bizquery\mapper\QccInfoMapper.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\jnzmquatation\controller\JNController.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\JNApplication.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\zmquotation\mapper\InventoryMapper.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\zmquotation\service\RegionService.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\bizquery\dto\BizDto.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\jnzmquatation\mapper\JnRegionMapper.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\config\WebMvcConfig.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\bizquery\controller\BizController.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\bizquery\service\impl\BizServiceImpl.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\bizquery\entity\QccInfo.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\jnzmquatation\service\impl\JnRegionServiceImpl.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\common\CustomException.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\common\JacksonObjectMapper.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\jnzmquatation\dto\JnMaterialDto.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\utils\HttpHelper.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\utils\StringUtils.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\utils\SMSUtils.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\jnzmquatation\service\impl\JnInventoryServiceImpl.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\bizquery\service\impl\QccInfoServiceImpl.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\jnzmquatation\service\JnInventoryService.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\service\EmployeeService.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\zmquotation\service\impl\InventoryServiceImpl.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\common\GlobalExceptionHandler.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\zmquotation\controller\ZMController.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\service\impl\EmployeeServiceImpl.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\common\BaseContext.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\common\R.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\jnzmquatation\mapper\JnMaterialMapper.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\zmquotation\mapper\MaterialMapper.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\zmquotation\service\impl\RegionServiceImpl.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\demo\zmquotation\dto\MaterialDto.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\utils\ValidateCodeUtils.java
|
||||
E:\myproject\JNDemo\src\main\java\com\JN\common\MyMetaObjecthandler.java
|
||||
Loading…
Reference in New Issue