From 66a2bbaed29c6134b84e0916c96916a983bc64e8 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 20 十月 2023 11:02:58 +0800
Subject: [PATCH] zjh 2023/10/20--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSummaryController.java | 20 +++++-
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java | 5 +
ltkj-admin/src/main/java/com/ltkj/web/controller/app/WxloginController.java | 2
ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java | 34 ++++++-----
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java | 8 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java | 9 +++
ltkj-admin/src/main/resources/application.yml | 1
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTollCollectorController.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjTollCollector.java | 3 +
ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/NewFlowingWaterVo.java | 7 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysProfileController.java | 7 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java | 75 +++++++++++++++----------
13 files changed, 122 insertions(+), 53 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/WxloginController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/WxloginController.java
index b7519bf..b65f275 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/WxloginController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/WxloginController.java
@@ -156,7 +156,7 @@
byte[] raw = decoder.decodeBuffer(sessionKey);
SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES");
IvParameterSpec iv1 = new IvParameterSpec(decoder.decodeBuffer(iv));
- Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+ Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding","BC");
cipher.init(Cipher.DECRYPT_MODE, skeySpec, iv1);
OkHttpClient client = new OkHttpClient();
Request okrequest = new Request.Builder()
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysProfileController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysProfileController.java
index 5534edb..cad0dd1 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysProfileController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysProfileController.java
@@ -1,5 +1,6 @@
package com.ltkj.web.controller.system;
+import com.ltkj.common.utils.sign.RsaUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -93,6 +94,12 @@
LoginUser loginUser = getLoginUser();
String userName = loginUser.getUsername();
String password = loginUser.getPassword();
+ try {
+ oldPassword = RsaUtils.decryptByPrivateKey(oldPassword);
+ newPassword = RsaUtils.decryptByPrivateKey(newPassword);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
if(userName.equals("10001")){
oldPassword=userName+oldPassword;
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java
index 8288bcc..8679e72 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java
@@ -1,19 +1,14 @@
package com.ltkj.web.controller.system;
-import cn.hutool.core.codec.Base64;
+
import cn.hutool.core.date.DateUtil;
-import cn.hutool.extra.pinyin.PinyinUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.AjaxResult;
-import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.utils.SecurityUtils;
-import com.ltkj.framework.config.MatchUtils;
+import com.ltkj.framework.config.UserHoder;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.vodomain.NewFlowingWaterVo;
-import com.ltkj.hosp.vodomain.TjCollectFeesVo;
-import com.ltkj.mall.domain.MallCheckLog;
-import com.ltkj.mall.domain.MallOrder;
import com.ltkj.mall.mallOrderUtils.TjConstants;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -22,10 +17,6 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -61,12 +52,22 @@
+ @GetMapping("/getNewDate")
+ @ApiOperation(value = "鑾峰彇鏈嶅姟鍣ㄥ綋鍓嶆椂闂�")
+ public AjaxResult getNewDate() {
+
+ Date date = DateUtil.parse(DateUtil.format(DateUtil.date(),"yyyy-MM-dd HH:mm:ss"),"yyyy-MM-dd HH:mm:ss");
+ return AjaxResult.success(date);
+ }
+
+
+
@GetMapping("/getFlowingWaterList")
@ApiOperation(value = "鑾峰彇浣撴鏀惰垂璁板綍鎺ュ彛")
public AjaxResult getFlowingWaterList(@RequestParam(required = false) @ApiParam(value = "浣撴鍙�") String phone,
@RequestParam(required = false) @ApiParam(value = "浣撴浜哄鍚�") String name,
- @RequestParam(defaultValue = "1") @ApiParam(value = "鏀惰垂1 閫�璐�2") Long type) {
+ @RequestParam(defaultValue = "1") @ApiParam(value = "鏀惰垂1 閫�璐�2 4閫�璐瑰憳椤甸潰") Long type) {
List<TjFlowingWater> waterList =null;
List<Long> collect =null;
TjCustomer one =null;
@@ -91,7 +92,15 @@
wq1.in(TjFlowingWater::getOrderId, collect);
}
wq1.between(TjFlowingWater::getCreateTime,DateUtil.beginOfDay(date),DateUtil.endOfDay(date));
- wq1.eq(TjFlowingWater::getPayStasus,type);
+ if(type==1){
+ wq1.eq(TjFlowingWater::getPayStasus,type);
+ wq1.eq(TjFlowingWater::getTollCollectorId, UserHoder.getLoginUser().getUserId());
+ }else if(type==4){
+ wq1.eq(TjFlowingWater::getPayStasus,1);
+ }else {
+ wq1.eq(TjFlowingWater::getPayStasus,type);
+ }
+
waterList = flowingWaterService.list(wq1);
if(null !=waterList && waterList.size()>0){
@@ -100,6 +109,8 @@
if (null != order) {
if (null != customerService.getById(order.getUserId())) {
flowingWater.setCustomer(customerService.getById(order.getUserId()));
+ flowingWater.setTjNumber(order.getTjNumber());
+ flowingWater.setTjProName(flowingWaterService.getproNameByOrderId(order.getTjNumber()));
}
}
}
@@ -130,25 +141,15 @@
@Transactional
public AjaxResult addOrderAndDetail(@RequestBody NewFlowingWaterVo vo) {
- if (!MatchUtils.isMobileNO(vo.getPhone())) {
- return AjaxResult.error("鎵嬫満鍙锋牸寮忔湁璇�!");
- }
-// Long cusId = null;
-// LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
-// wq.eq(TjCustomer::getCusName, vo.getName());
-// wq.eq(TjCustomer::getCusPhone, vo.getPhone());
-// TjCustomer one = customerService.getOne(wq);
-// if (null == one) {
+// if (!MatchUtils.isMobileNO(vo.getPhone())) {
+// return AjaxResult.error("鎵嬫満鍙锋牸寮忔湁璇�!");
+// }
TjCustomer customer = new TjCustomer();
if(null !=vo.getPhone())customer.setCusPhone(vo.getPhone());
customer.setCusName(vo.getName());
customer.setCusBrithday(new Date());
customer.setCusSex(0L);
customerService.save(customer);
-// cusId = customer.getCusId();
-// } else {
-// cusId = one.getCusId();
-// }
Date date=new Date();
TjOrder tjOrder = new TjOrder();
tjOrder.setUserId(customer.getCusId());
@@ -171,7 +172,12 @@
TjOrderDetail detail = new TjOrderDetail();
detail.setOrderId(tjOrder.getOrderId());
- detail.setProId(1712272744924446722L);
+ if(null==vo.getTjPro()){
+ detail.setProId(1712272744924446722L);
+ }else {
+ detail.setProId(vo.getTjPro());
+ }
+ detail.setProId(vo.getTjPro());
detail.setProType("0");
detailService.save(detail);
@@ -193,9 +199,18 @@
detailService.updateById(detail);
TjChargingStandard tjChargingStandard = new TjChargingStandard();
tjChargingStandard.setTjNum(tjOrder.getTjNumber());
- tjChargingStandard.setProId(1712272744924446722L);
- tjChargingStandard.setPrice(vo.getYs().divide(BigDecimal.valueOf(Long.parseLong(vo.getNumber()))));
- tjChargingStandard.setProName("浣撴椤圭洰");
+ if(null==vo.getTjPro()){
+ tjChargingStandard.setProId(1712272744924446722L);
+ }else {
+ tjChargingStandard.setProId(vo.getTjPro());
+ }
+ tjChargingStandard.setProId(vo.getTjPro());
+ tjChargingStandard.setPrice(vo.getSs());
+ if(null==vo.getTjProName()){
+ tjChargingStandard.setProName("浣撴椤圭洰");
+ }else {
+ tjChargingStandard.setProName(vo.getTjProName());
+ }
tjChargingStandard.setCount(Long.valueOf(vo.getNumber()));
chargingStandardService.save(tjChargingStandard);
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSummaryController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSummaryController.java
index 7ecc9f8..cf7a74d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSummaryController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSummaryController.java
@@ -1,5 +1,6 @@
package com.ltkj.web.controller.system;
+import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.google.common.base.Joiner;
import com.ltkj.common.core.domain.AjaxResult;
@@ -80,7 +81,7 @@
wqq.between(TjTollCollector::getCreateTime, accountBeginTime, accountEndTime);
}
wqq.orderByDesc(TjTollCollector::getCreateTime);
- wqq.eq(TjTollCollector::getIsHz,"N");
+ wqq.isNull(TjTollCollector::getIsHz);
List<TjTollCollector> list= collectorService.list(wqq);
return AjaxResult.success(list);
}
@@ -102,7 +103,7 @@
zshoukuan=zshoukuan.add(collector.getAmountReceived());
ztuikuan=ztuikuan.add(collector.getRefundAmount());
zyingjiao=zyingjiao.add(collector.getPayable());
- collector.setIsHz("Y");
+ collector.setIsHz(accountId);
collectorService.updateById(collector);
}
}
@@ -138,7 +139,7 @@
String[] split = accountId.split(";");
for (String s : split) {
TjTollCollector tollCollector = collectorService.getTjTollCollectorById(s);
- tollCollector.setIsHz("N");
+ tollCollector.setIsHz(null);
collectorService.updateById(tollCollector);
}
return AjaxResult.success("璇ヨ处鍗曞凡鎴愬姛鎾ら攢");
@@ -156,4 +157,17 @@
return AjaxResult.success(printSetUp);
}
+
+ @GetMapping("/getLastTime")
+ @ApiOperation(value = "鑾峰彇姹囨�绘椂闂磋捣濮嬫椂闂�")
+ public AjaxResult getLastTime() {
+ LambdaQueryWrapper<TjSummary> wq = new LambdaQueryWrapper<>();
+ wq.orderByDesc(TjSummary::getCreateTime);
+ List<TjSummary> list = summaryService.list(wq);
+ if (null != list && list.size() > 0) return AjaxResult.success(list.get(0).getCreateTime());
+ String dateStr = "2023-10-01 00:00:00";
+ Date date = DateUtil.parse(dateStr, "yyyy-MM-dd HH:mm:ss");
+ return AjaxResult.success(date);
+ }
+
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTollCollectorController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTollCollectorController.java
index 352c776..c6a95b3 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTollCollectorController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTollCollectorController.java
@@ -211,7 +211,7 @@
wq.orderByDesc(TjTollCollector::getAccountEndTime);
List<TjTollCollector> list = tjTollCollectorService.list(wq);
if (null != list && list.size() > 0) return success(list.get(0).getAccountEndTime());
- String dateStr = "1970-01-01 00:00:00";
+ String dateStr = "2023-10-01 00:00:00";
Date date = DateUtil.parse(dateStr, "yyyy-MM-dd HH:mm:ss");
return AjaxResult.success(date);
}
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index 93abbcd..f8c9c22 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -210,6 +210,7 @@
jimu:
path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
# path: http://192.168.0.99:8080/ltkj-admin
+# path: http://192.168.0.99:8081/ltkj-admin
# path: http://192.168.0.101:5011
jeecg :
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
index 45ab164..910b304 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
@@ -19,9 +19,7 @@
import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.hosp.service.IDictHospService;
import com.ltkj.hosp.service.ITjCustomerService;
-import com.ltkj.system.service.ISysDeptService;
-import com.ltkj.system.service.ISysMenuService;
-import com.ltkj.system.service.SysParametersDisposeService;
+import com.ltkj.system.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.authentication.AuthenticationManager;
@@ -39,7 +37,6 @@
import com.ltkj.framework.manager.AsyncManager;
import com.ltkj.framework.manager.factory.AsyncFactory;
import com.ltkj.framework.security.context.AuthenticationContextHolder;
-import com.ltkj.system.service.ISysUserService;
import java.util.Date;
import java.util.HashMap;
@@ -75,6 +72,8 @@
private ISysDeptService deptService;
@Autowired
private SysParametersDisposeService parametersDisposeService;
+ @Autowired
+ private ISysConfigService configService;
// 鏄惁鍏佽璐︽埛澶氱粓绔悓鏃剁櫥褰曪紙true鍏佽 false涓嶅厑璁革級
@Value("${token.soloLogin}")
@@ -96,18 +95,21 @@
*/
public String login(String username, String password, Boolean type,String code,String uuid) {
- String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid;
- String captcha = redisCache.getCacheObject(verifyKey);
- redisCache.deleteObject(verifyKey);
- if (captcha == null)
- {
- AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire")));
- throw new CaptchaExpireException();
- }
- if (!code.equalsIgnoreCase(captcha))
- {
- AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));
- throw new CaptchaException();
+ String aSwitch = configService.selectConfigByKey("captcha_switch");
+ if(null !=aSwitch && aSwitch.equals("Y")){
+ String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid;
+ String captcha = redisCache.getCacheObject(verifyKey);
+ redisCache.deleteObject(verifyKey);
+ if (captcha == null)
+ {
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire")));
+ throw new CaptchaExpireException();
+ }
+ if (!code.equalsIgnoreCase(captcha))
+ {
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));
+ throw new CaptchaException();
+ }
}
// 鐢ㄦ埛楠岃瘉
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java
index 8d95662..37035ee 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java
@@ -118,6 +118,14 @@
@TableField(exist = false)
private String tollCollectorName;
+ @ApiModelProperty(value = "浣撴鍙�")
+ @TableField(exist = false)
+ private String tjNumber;
+
+ @ApiModelProperty(value = "浣撴椤圭洰鍚�")
+ @TableField(exist = false)
+ private String tjProName;
+
@ApiModelProperty(value = "鍗曢」ids")
@TableField(exist = false)
private String[] tjProIds;
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjTollCollector.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjTollCollector.java
index d059c06..8dbff31 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjTollCollector.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjTollCollector.java
@@ -4,6 +4,8 @@
import java.util.List;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -93,6 +95,7 @@
private BigDecimal payable;
@ApiModelProperty(value = "鏄惁姹囨��")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String isHz;
/**
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java
index 88f4d80..bf4c625 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java
@@ -72,4 +72,13 @@
@Select("\tSELECT a.discount/10 FROM tj_flowing_water a WHERE 1=1 AND a.deleted =0 AND a.order_id=#{orderId} AND a.discount !='/'")
String getDiscount(String orderId);
+
+
+// @Select("\tSELECT GROUP_CONCAT(b.pro_name ) proname FROM tj_order_detail a \n" +
+// " LEFT JOIN tj_project b ON a.pro_id=b.pro_id \n" +
+// "\t WHERE a.order_id=#{orderId}")
+// String getproNameByOrderId(String orderId);
+
+ @Select("SELECT GROUP_CONCAT(a.pro_name ) proname FROM tj_charging_standard a WHERE a.tj_num=#{orderId}")
+ String getproNameByOrderId(String orderId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java
index 80ce564..07aaed8 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java
@@ -64,4 +64,6 @@
List<String> getFlowingWaterIds(String tjNum);
String getDiscount(String orderId);
+
+ String getproNameByOrderId(String orderId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java
index 4b72293..662bfc7 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java
@@ -102,4 +102,9 @@
public String getDiscount(String orderId) {
return tjFlowingWaterMapper.getDiscount(orderId);
}
+
+ @Override
+ public String getproNameByOrderId(String orderId) {
+ return tjFlowingWaterMapper.getproNameByOrderId(orderId);
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/NewFlowingWaterVo.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/NewFlowingWaterVo.java
index 897dc6a..a8a4cbb 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/NewFlowingWaterVo.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/NewFlowingWaterVo.java
@@ -21,8 +21,11 @@
//鎵嬫満鍙�
private String phone;
- //浣撴椤圭洰
- private String tjPro;
+ //浣撴椤圭洰id
+ private Long tjPro;
+
+ //浣撴椤圭洰鍚嶇О
+ private String tjProName;
//鏁伴噺
private String number;
--
Gitblit v1.8.0