Commit eae2a355 authored by fangxinjiang's avatar fangxinjiang

分布式锁调试--档案新增副本数测试

parent da8bc456
......@@ -1296,4 +1296,6 @@ public class InsurancesConstants {
*/
public static final String AGAIN_UPDATE_STATUS = "再次同步状态成功";
public static final String UPLOAD_PARAM_CHECK_FAIL="上传必要参数不能为空";
}
......@@ -106,4 +106,10 @@ public class InsuranceListParam extends BaseEntity {
@Schema(description = "购买标准结束")
private Integer buyStandardMax;
@Schema(description ="客户名称")
private String unitName;
@Schema(description ="客户编码")
private String unitNo;
}
......@@ -159,4 +159,10 @@ public class InsuranceListVO implements Serializable {
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("派单日期")
private LocalDateTime createTime;
@Schema(description ="客户名称")
private String unitName;
@Schema(description ="客户编码")
private String unitNo;
}
......@@ -182,7 +182,22 @@ public class InsuredListVo implements Serializable {
@Schema(description = "减员状态 1待减员 2减员中3减员退回")
@ExcelIgnore
private Integer reduceHandleStatus;
/**
* 客户名称
*/
@HeadFontStyle(fontHeightInPoints = 11)
@Schema(description ="客户名称")
@ExcelProperty(value = "客户名称")
private String unitName;
/**
* 客户编码
*/
@HeadFontStyle(fontHeightInPoints = 11)
@Schema(description ="客户编码")
@ExcelProperty(value = "客户编码")
@ExcelIgnore
private String unitNo;
/**
* 项目编码
*/
......@@ -314,6 +329,4 @@ public class InsuredListVo implements Serializable {
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "封面抬头")
private String invoiceTitle;
}
......@@ -131,4 +131,10 @@ public class InsuredParam extends BaseEntity implements Serializable {
**/
private int limitEnd;
@Schema(description ="客户名称")
private String unitName;
@Schema(description ="客户编码")
private String unitNo;
}
package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import lombok.Data;
import java.io.Serializable;
/**
* @auther wangan
* @date 2019/12/3
* @Description: 工作台消息提醒
*/
@Data
public class WorkBanchWarnVo implements Serializable {
private static final long serialVersionUID = 1L;
//消息中文
String mesage;
//总数
int count;
//跳转url
String url;
}
package com.yifu.cloud.plus.v1.yifu.insurances.controller;
import cn.hutool.core.util.CharsetUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail;
import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceDetailService;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.TBusinessInsuranceVo;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.WorkBanchWarnVo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
/**
* @Author fxj
* @Date 2023/2/16
* @Description 商险提醒相关
* @Version 1.0
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/insuranceWarn")
@Tag(name = "商险提醒相关")
public class TInsurancesWarnController {
@Resource
private TInsuranceDetailService insuranceDetailService;
/**
* @Author fxj
* @Description 商险到期提醒分页查询
* @Date 16:51 2023/2/16
**/
@Operation(description = "商险到期提醒分页查询")
@GetMapping("/getExpireWarn/Vopage")
public R<IPage<TBusinessInsuranceVo>> getTBusinessInsuranceExpireWarnVoPage(Page<TBusinessInsuranceVo> page, TBusinessInsuranceVo tBusinessInsurance) {
return insuranceDetailService.getInsuranceExpireWarnVoPage(page, tBusinessInsurance);
}
/**
* @Author fxj
* @Description 备注批量导入
* @Date 16:57 2023/2/16
**/
@Operation(description = "备注批量导入(wxhr:insurance_remark_add)")
@SysLog("备注批量导入")
@PostMapping("/remark/batchAdd")
public R<Object> remarkBatchAdd(@RequestBody String jsonString) {
/*ExcelUtil<TBusinessInsuranceVo> util1 = new ExcelUtil<>(TBusinessInsuranceVo.class);
util1.parseJsonStringToList(jsonString, BasicServiceUtil.initMapForExport(remoteSysDictService, preRemoteBasicArchivesService));
List<TBusinessInsuranceVo> businessInsuranceVoList = util1.getEntityList();
if (businessInsuranceVoList.isEmpty()) {
return Result.fail("无数据");
}
if (null != util1.getErrorInfo() && !util1.getErrorInfo().isEmpty()) {
return Result.fail(InsuranceConstant.DATA_CHECK_FAIL, util1.getErrorInfo());
}*/
return null;//insuranceDetailService.remarkBatchAdd(businessInsuranceVoList);
}
/**
* @Author fxj
* @Description 商险到期提醒分页查询导出
* @Date 16:57 2023/2/16
**/
@GetMapping("/getExpireWarn/export")
@Operation(description = "商险到期提醒分页查询导出 hasPermission('wxhr:insurance_expirewarnexport')")
@SysLog("商险到期提醒分页查询导出")
@PreAuthorize("@pms.hasPermission('wxhr:insurance_expirewarnexport')")
public void getExpireWarnExport(HttpServletResponse response, HttpServletRequest request,
@RequestParam(name = "idStr", required = false) String[] idstr,
@RequestParam(name = "exportFields", required = true) String[] exportFields, TBusinessInsuranceVo vo) {
List<TBusinessInsuranceVo> list = null;
}
/**
* @Author fxj
* @Description 到期提醒备注
* @Date 17:01 2023/2/16
**/
@Operation(description = "到期提醒备注")
@SysLog("到期提醒备注")
@PutMapping("/expireRemark")
public R<Object> expireRemark(@RequestBody TBusinessInsuranceVo vo) {
if (Common.isEmpty(vo.getId()) || Common.isEmpty(vo.getExpireRemark())) {
return R.failed(InsurancesConstants.UPLOAD_PARAM_CHECK_FAIL);
}
TInsuranceDetail entity = insuranceDetailService.getById(vo.getId());
if (entity == null) {
return R.failed("未查询到相关商险订单");
}
/* entity.setExpireRemark(vo.getExpireRemark());
entity.setLastUpdateUser(SecurityUtils.getUser().getNickName());
entity.setLastUpdateUserId(SecurityUtils.getUser().getId());
entity.setLastUpdateTime(LocalDateTime.now());*/
insuranceDetailService.updateById(entity);
return R.ok("操作成功");
}
/**
* @Author fxj
* @Description 到期提醒忽略
* @Date 17:01 2023/2/16
**/
@Operation(description = "到期提醒忽略(wxhr:insurance_expireignore)")
@SysLog("到期提醒忽略")
@PutMapping("/expireIgnore")
@PreAuthorize("@pms.hasPermission('wxhr:insurance_expireignore')")
public R<Object> expireIgnore(@RequestBody TBusinessInsuranceVo vo) {
if (Common.isEmpty(vo.getId())) {
return R.failed(InsurancesConstants.UPLOAD_PARAM_CHECK_FAIL);
}
return insuranceDetailService.expireIgnore(vo);
}
/**
* @Author fxj
* @Description 到期提醒批量忽略
* @Date 17:06 2023/2/16
**/
@Operation(description = "到期提醒批量忽略(wxhr:insurance_expireignore)")
@SysLog("到期提醒批量忽略")
@PutMapping("/batchexpireIgnore")
@PreAuthorize("@pms.hasPermission('wxhr:insurance_expireignore')")
public R<Object> batchexpireIgnore(@RequestParam("ids") String ids) {
return insuranceDetailService.batchexpireIgnore(ids);
}
/**
* @Author: wangan
* @Date: 2020/5/18
* @Description: 到期提醒忽略
* @return: com.yifu.cloud.v1.common.core.util.R
**/
/*@Operation(description = "到期提醒忽略(wxhr:insurance_expireignore)")
@SysLog("到期提醒忽略")
@PutMapping("/batchExpireIgnore")
@PreAuthorize("@pms.hasPermission('wxhr:insurance_expireignore')")
public Result<Object> batchExpireIgnoreList(@RequestBody List<TBusinessInsurance> voList) {
if (voList.isEmpty()) {
return Result.fail("无数据");
}
ArrayList<ErrorMessage> errorMessages = Lists.newArrayList();
for (int i = 0; i < voList.size(); i++) {
TBusinessInsurance vo = voList.get(i);
if (Common.isEmpty(vo.getId())) {
errorMessages.add(new ErrorMessage(i + 1, "提醒商险ID不能为空"));
continue;
}
TBusinessInsurance entity = tBusinessInsuranceService.getById(vo.getId());
if (entity == null) {
errorMessages.add(new ErrorMessage(i + 1, "未查询到相关商险订单"));
continue;
}
try {
entity.setExpireIgnoreFlag(CommonConstants.dingleDigitStrArray[0]);
entity.setLastUpdateUser(SecurityUtils.getUser().getNickName());
entity.setLastUpdateUserId(SecurityUtils.getUser().getId());
entity.setLastUpdateTime(LocalDateTime.now());
tBusinessInsuranceService.updateById(entity);
} catch (Exception e) {
log.error("执行异常", e);
errorMessages.add(new ErrorMessage(i + 1, "执行忽略失败"));
continue;
}
}
if (!errorMessages.isEmpty()) {
return Result.fail("数据条数" + voList.size(), voList, errorMessages);
}
return Result.success("数据条数" + voList.size(), voList, errorMessages);
}*/
/**
* @Author fxj
* @Description 工作台消息提醒:商险到期总数通知提醒/商险未购买总数通知提醒
* @Date 17:03 2023/2/16
**/
@Operation(description = "商险到期总数通知提醒/商险未购买总数通知提醒")
@PostMapping("/inner/workBranch/getWorkBanchInsuranceMessageWarn")
public R<List<WorkBanchWarnVo>> getExpireInsuranceWarn(@RequestBody
Integer expireInsuranceWarnNameUrlFlag,
Integer noBuyInsuranceWarnNameUrlFlag,
Integer noSettleInsuranceWarnNameUrlFlag, Boolean haveAllOrg, Integer userId) {
return insuranceDetailService.getExpireInsuranceWarn(expireInsuranceWarnNameUrlFlag, noBuyInsuranceWarnNameUrlFlag, noSettleInsuranceWarnNameUrlFlag, haveAllOrg, userId);
}
}
......@@ -509,4 +509,12 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
* @return:
**/
void updateSettleStatus();
R<IPage<TBusinessInsuranceVo>> getInsuranceExpireWarnVoPage(Page<TBusinessInsuranceVo> page, TBusinessInsuranceVo tBusinessInsurance);
R<List<WorkBanchWarnVo>> getExpireInsuranceWarn(Integer expireInsuranceWarnNameUrlFlag, Integer noBuyInsuranceWarnNameUrlFlag, Integer noSettleInsuranceWarnNameUrlFlag, Boolean haveAllOrg, Integer userId);
R<Object> batchexpireIgnore(String ids);
R<Object> expireIgnore(TBusinessInsuranceVo vo);
}
......@@ -7370,5 +7370,29 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
return mapSelectVo;
}
/**
* @Author fxj
* @Description 商险到期提醒分页查询
* @Date 16:51 2023/2/16
**/
@Override
public R<IPage<TBusinessInsuranceVo>> getInsuranceExpireWarnVoPage(Page<TBusinessInsuranceVo> page, TBusinessInsuranceVo tBusinessInsurance) {
return null;
}
@Override
public R<List<WorkBanchWarnVo>> getExpireInsuranceWarn(Integer expireInsuranceWarnNameUrlFlag, Integer noBuyInsuranceWarnNameUrlFlag, Integer noSettleInsuranceWarnNameUrlFlag, Boolean haveAllOrg, Integer userId) {
return null;
}
@Override
public R<Object> batchexpireIgnore(String ids) {
return null;
}
@Override
public R<Object> expireIgnore(TBusinessInsuranceVo vo) {
return null;
}
}
......@@ -4,10 +4,10 @@ spring:
matching-strategy: ant_path_matcher
config:
activate:
on-profile: test
on-profile: dev
redis:
host: 192.168.1.65
port: 22379
host: 127.0.0.1
port: 6379
password: '@yf_2017'
datasource:
insurances:
......@@ -21,7 +21,7 @@ spring:
driver-class-name: com.mysql.cj.jdbc.Driver
username: root
password: ekp!@#123
jdbc-url: jdbc:mysql://119.96.192.73:3306/ekp?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
jdbc-url: jdbc:mysql://36.7.147.19:20023/ekp?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
hikari:
minimum-idle: 10 # 最小空闲连接数量
idle-timeout: 60000 # 空闲连接存活最大时间,默认600000(10分钟)
......
......@@ -114,9 +114,17 @@
a.SETTLE_MONTH as settleMonth,
a.DEPT_NAME as projectName,
a.REDUCE_HANDLE_STATUS as reduceHandleStatus,
a.CREATE_TIME as createTime
a.CREATE_TIME as createTime,
a.UNIT_NAME as unitName,
a.UNIT_NO as unitNo
from t_insurance_detail a
where a.DELETE_FLAG = 0
<if test="param.unitName != null and param.unitName.trim() != ''">
and a.UNIT_NAME like concat(replace(replace(#{param.unitName},'_','\_'),'%','\%'),'%')
</if>
<if test="param.unitNo != null and param.unitNo.trim() != ''">
and a.UNIT_NO like concat(replace(replace(#{param.unitNo},'_','\_'),'%','\%'),'%')
</if>
<if test="param.deptNo != null and param.deptNo.trim() != ''">
and a.DEPT_NO = #{param.deptNo}
</if>
......@@ -479,13 +487,21 @@
a.CREATE_USER_DEPT_NAME as createUserDeptName,
a.BUY_STANDARD as buyStandard,
a.CREATE_TIME as createTime,
a.CREATE_NAME as createName
a.CREATE_NAME as createName,
a.UNIT_NAME as unitName,
a.UNIT_NO as unitNo
from
t_insurance_detail a
where
a.DELETE_FLAG = 0
and
a.BUY_HANDLE_STATUS = 3
<if test="param.unitName != null and param.unitName.trim() != ''">
and a.UNIT_NAME like concat(replace(replace(#{param.unitName},'_','\_'),'%','\%'),'%')
</if>
<if test="param.unitNo != null and param.unitNo.trim() != ''">
and a.UNIT_NO like concat(replace(replace(#{param.unitNo},'_','\_'),'%','\%'),'%')
</if>
<if test="param.createName != null and param.createName.trim() != ''">
and a.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%')
</if>
......@@ -573,13 +589,21 @@
a.IS_EFFECT as isEffect,
a.IS_OVERDUE as isOverdue,
a.CREATE_TIME as createTime,
a.CREATE_NAME as createName
a.CREATE_NAME as createName,
a.UNIT_NAME as unitName,
a.UNIT_NO as unitNo
from
t_insurance_detail a
where
a.DELETE_FLAG = 0
and
a.BUY_HANDLE_STATUS = 3
<if test="param.unitName != null and param.unitName.trim() != ''">
and a.UNIT_NAME like concat(replace(replace(#{param.unitName},'_','\_'),'%','\%'),'%')
</if>
<if test="param.unitNo != null and param.unitNo.trim() != ''">
and a.UNIT_NO like concat(replace(replace(#{param.unitNo},'_','\_'),'%','\%'),'%')
</if>
<if test="param.createName != null and param.createName.trim() != ''">
and a.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%')
</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment