1.资料管理相关

tnc-base/tnc-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java

@@ -28,6 +28,11 @@ public class LoginUser {
 	 */
 	private String id;
 
+	/**
+	 * 员工编号
+	 */
+	private String workNo;
+
 	/**
 	 * 登录人账号
 	 */

tnc-sms/src/main/java/org/jeecg/modules/smscheck/configs/CheckStateCode.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.smscheck.configs;
+
+/**
+ * 稽核状态编码
+ */
+public final class CheckStateCode {
+    public static final Integer CHECK_STSTE_0 = 0;
+    public static final Integer CHECK_STSTE_1 = 1;
+    public static final Integer CHECK_STSTE_2 = 2;
+    public static final Integer CHECK_STSTE_3 = 3;
+    public static final Integer CHECK_STSTE_4 = 4;
+    public static final Integer CHECK_STSTE_5 = 5;
+
+}

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckCustomerDataController.java

@@ -1,156 +1,249 @@
 package org.jeecg.modules.smscheck.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.CommonUtils;
+import org.jeecg.common.util.MinioUtil;
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerData;
+import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
 import org.jeecg.modules.smscheck.service.ISmsCheckCustomerDataService;
+import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoService;
 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 javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
+import java.util.List;
 
- /**
- * @description 客户资料
+/**
  * @author jeecg-boot
- * @date 2022-06-27
  * @version V1.0
+ * @description 客户资料
+ * @date 2022-06-27
  */
-@Api(tags="客户资料")
+@Api(tags = "客户资料")
 @RestController
 @RequestMapping("/smsCheck/customerData")
 @Slf4j
 public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCustomerData, ISmsCheckCustomerDataService> {
-	@Autowired
-	private ISmsCheckCustomerDataService smsCheckCustomerDataService;
-
-	 /**
-	  * 分页列表查询
-	  *
-	  * @param smsCheckCustomerData 对象
-	  * @param pageNo 页码
-	  * @param pageSize 每页条数
-	  * @param request 请求
-	  * @return 结果
-	  */
-	//@AutoLog(value = "客户资料-分页列表查询")
-	@ApiOperation(value="客户资料-分页列表查询", notes="客户资料-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<SmsCheckCustomerData>> queryPageList(SmsCheckCustomerData smsCheckCustomerData,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest request) {
-		QueryWrapper<SmsCheckCustomerData> queryWrapper = QueryGenerator.initQueryWrapper(smsCheckCustomerData, request.getParameterMap());
-		Page<SmsCheckCustomerData> page = new Page<>(pageNo, pageSize);
-		IPage<SmsCheckCustomerData> pageList = smsCheckCustomerDataService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-
-	 /**
-	  * 添加
-	  *
-	  * @param smsCheckCustomerData 对象
-	  * @return 结果
-	  */
-	@AutoLog(value = "客户资料-添加")
-	@ApiOperation(value="客户资料-添加", notes="客户资料-添加")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody SmsCheckCustomerData smsCheckCustomerData) {
-		smsCheckCustomerDataService.save(smsCheckCustomerData);
-		return Result.OK("添加成功！");
-	}
-
-	 /**
-	  * 编辑
-	  *
-	  * @param smsCheckCustomerData 对象
-	  * @return 结果
-	  */
-	@AutoLog(value = "客户资料-编辑")
-	@ApiOperation(value="客户资料-编辑", notes="客户资料-编辑")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody SmsCheckCustomerData smsCheckCustomerData) {
-		smsCheckCustomerDataService.updateById(smsCheckCustomerData);
-		return Result.OK("编辑成功!");
-	}
-	
-	 /**
-	  * 通过id删除
-	  *
-	  * @param id 主键
-	  * @return 结果
-	  */
-	@AutoLog(value = "客户资料-通过id删除")
-	@ApiOperation(value="客户资料-通过id删除", notes="客户资料-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id") String id) {
-		smsCheckCustomerDataService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	 /**
-	  * 批量删除
-	  *
-	  * @param ids 主键
-	  * @return 结果
-	  */
-	@AutoLog(value = "客户资料-批量删除")
-	@ApiOperation(value="客户资料-批量删除", notes="客户资料-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids") String ids) {
-		this.smsCheckCustomerDataService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-	
-	 /**
-	  * 通过id查询
-	  *
-	  * @param id 主键
-	  * @return 数据
-	  */
-	//@AutoLog(value = "客户资料-通过id查询")
-	@ApiOperation(value="客户资料-通过id查询", notes="客户资料-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<SmsCheckCustomerData> queryById(@RequestParam(name="id") String id) {
-		SmsCheckCustomerData smsCheckCustomerData = smsCheckCustomerDataService.getById(id);
-		if(smsCheckCustomerData==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(smsCheckCustomerData);
-	}
-
-	 /**
-	  * 导出excel
-	  *
-	  * @param request 请求
-	  * @param smsCheckCustomerData 对象
-	  * @return excel文件
-	  */
+    @Autowired
+    private ISmsCheckCustomerDataService smsCheckCustomerDataService;
+    @Autowired
+    private ISmsCheckCustomerInfoService smsCheckCustomerInfoService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param smsCheckCustomerData 对象
+     * @param pageNo               页码
+     * @param pageSize             每页条数
+     * @param request              请求
+     * @return 结果
+     */
+    //@AutoLog(value = "客户资料-分页列表查询")
+    @ApiOperation(value = "客户资料-分页列表查询", notes = "客户资料-分页列表查询")
+    @GetMapping(value = "/list/page")
+    public Result<IPage<SmsCheckCustomerData>> queryPageList(SmsCheckCustomerData smsCheckCustomerData,
+                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                             HttpServletRequest request) {
+        QueryWrapper<SmsCheckCustomerData> queryWrapper = QueryGenerator.initQueryWrapper(smsCheckCustomerData, request.getParameterMap());
+        Page<SmsCheckCustomerData> page = new Page<>(pageNo, pageSize);
+        IPage<SmsCheckCustomerData> pageList = smsCheckCustomerDataService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+
+    @ApiOperation(value = "客户资料-列表查询", notes = "客户资料-列表查询")
+    @PostMapping(value = "/list")
+    public Result<IPage<SmsCheckCustomerData>> queryList(@RequestBody SmsCheckCustomerData smsCheckCustomerData) {
+        if (StringUtils.isEmpty(smsCheckCustomerData.getUserNo())){
+            return Result.error("用户编码不能为空");
+        }
+        LambdaQueryWrapper<SmsCheckCustomerData> queryWrapperData = new LambdaQueryWrapper<>();
+        queryWrapperData.eq(SmsCheckCustomerData::getUserNo,smsCheckCustomerData.getUserNo());
+        Page<SmsCheckCustomerData> page = new Page<>(1, 100);
+        IPage<SmsCheckCustomerData> pageList = smsCheckCustomerDataService.page(page, queryWrapperData);
+        return Result.OK(pageList);
+    }
+
+
+    /**
+     * 添加
+     *
+     * @param smsCheckCustomerData 对象
+     * @return 结果
+     */
+    @AutoLog(value = "客户资料-添加")
+    @ApiOperation(value = "客户资料-添加", notes = "客户资料-添加")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody SmsCheckCustomerData smsCheckCustomerData) {
+        smsCheckCustomerDataService.save(smsCheckCustomerData);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param smsCheckCustomerData 对象
+     * @return 结果
+     */
+    @AutoLog(value = "客户资料-编辑")
+    @ApiOperation(value = "客户资料-编辑", notes = "客户资料-编辑")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody SmsCheckCustomerData smsCheckCustomerData) {
+        smsCheckCustomerDataService.updateById(smsCheckCustomerData);
+        return Result.OK("编辑成功!");
+    }
+
+    @AutoLog(value = "客户资料-编辑")
+    @ApiOperation(value = "客户资料-编辑", notes = "客户资料-编辑")
+    @RequestMapping(value = "/edit/user/no", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> editUserNo(@RequestBody SmsCheckCustomerData smsCheckCustomerData) {
+        if (StringUtils.isEmpty(smsCheckCustomerData.getUserNo())) {
+            return Result.error("用户编码不能为空");
+        }
+        LambdaQueryWrapper<SmsCheckCustomerInfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SmsCheckCustomerInfo::getUserNo,smsCheckCustomerData.getUserNo());
+        String id = smsCheckCustomerInfoService.getOne(queryWrapper).getId();
+        smsCheckCustomerData.setId(id);
+
+        LambdaQueryWrapper<SmsCheckCustomerData> queryWrapperData = new LambdaQueryWrapper<>();
+        queryWrapperData.eq(SmsCheckCustomerData::getUserNo,smsCheckCustomerData.getUserNo());
+        List<SmsCheckCustomerData> list = smsCheckCustomerDataService.list(queryWrapperData);
+        if (list.size() == 0){
+            boolean save = smsCheckCustomerDataService.save(smsCheckCustomerData);
+            if (!save){
+                return Result.error("编辑失败");
+            }
+            return Result.OK("编辑成功!");
+        }
+        boolean edit = smsCheckCustomerDataService.updateById(smsCheckCustomerData);
+        if (!edit) {
+            return Result.error("编辑失败");
+        }
+        return Result.OK("编辑成功!");
+    }
+
+
+    /**
+     * 通过id删除
+     *
+     * @param id 主键
+     * @return 结果
+     */
+    @AutoLog(value = "客户资料-通过id删除")
+    @ApiOperation(value = "客户资料-通过id删除", notes = "客户资料-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id") String id) {
+        smsCheckCustomerDataService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids 主键
+     * @return 结果
+     */
+    @AutoLog(value = "客户资料-批量删除")
+    @ApiOperation(value = "客户资料-批量删除", notes = "客户资料-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids") String ids) {
+        this.smsCheckCustomerDataService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id 主键
+     * @return 数据
+     */
+    //@AutoLog(value = "客户资料-通过id查询")
+    @ApiOperation(value = "客户资料-通过id查询", notes = "客户资料-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<SmsCheckCustomerData> queryById(@RequestParam(name = "id") String id) {
+        SmsCheckCustomerData smsCheckCustomerData = smsCheckCustomerDataService.getById(id);
+        if (smsCheckCustomerData == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(smsCheckCustomerData);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request              请求
+     * @param smsCheckCustomerData 对象
+     * @return excel文件
+     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, SmsCheckCustomerData smsCheckCustomerData) {
         return super.exportXls(request, smsCheckCustomerData, SmsCheckCustomerData.class, "客户资料");
     }
 
-	 /**
-	  * 通过excel导入数据
-	  *
-	  * @param request 请求
-	  * @param response 响应
-	  * @return 导入结果
-	  */
+    /**
+     * 通过excel导入数据
+     *
+     * @param request  请求
+     * @param response 响应
+     * @return 导入结果
+     */
     @PostMapping(value = "/importExcel")
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, SmsCheckCustomerData.class);
     }
 
+
+    @PostMapping(value = "/uploadMinio")
+    public Result<?> uploadMinio(HttpServletRequest request) {
+        Result<?> result = new Result<>();
+        String bizPath = request.getParameter("biz");
+
+        //LOWCOD-2580 sys/common/upload接口存在任意文件上传漏洞
+        if (oConvertUtils.isNotEmpty(bizPath) && (bizPath.contains("../") || bizPath.contains("..\\"))) {
+            throw new JeecgBootException("上传目录bizPath，格式非法！");
+        }
+
+        if (oConvertUtils.isEmpty(bizPath)) {
+            bizPath = "";
+        }
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        // 获取上传文件对象
+        MultipartFile file = multipartRequest.getFile("file");
+        // 获取文件名
+        String orgName = file.getOriginalFilename();
+        orgName = CommonUtils.getFileName(orgName);
+        String file_url = MinioUtil.upload(file, bizPath);
+        if (oConvertUtils.isEmpty(file_url)) {
+            return Result.error("上传失败,请检查配置信息是否正确!");
+        }
+
+        //保存文件信息
+		 /*OSSFile minioFile = new OSSFile();
+		 minioFile.setFileName(orgName);
+		 minioFile.setUrl(file_url);
+		 ossFileService.save(minioFile);*/
+        result.setMessage(file_url);
+        result.setSuccess(true);
+        return result;
+    }
+
 }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckCustomerInfoController.java

@@ -5,15 +5,21 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.system.vo.SysUserCacheInfo;
+import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.smscheck.configs.CheckStateCode;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
 import org.jeecg.modules.smscheck.entity.SmsCheckWorkLog;
 import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoService;
@@ -22,190 +28,255 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
+import java.util.List;
 
- /**
- * @description 客户信息
+/**
  * @author jeecg-boot
- * @date 2022-06-22
  * @version V1.0
+ * @description 客户信息
+ * @date 2022-06-22
  */
-@Api(tags="客户信息")
+@Api(tags = "客户信息")
 @RestController
 @RequestMapping("/smsCheck/customerInfo")
 @Slf4j
 public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCustomerInfo, ISmsCheckCustomerInfoService> {
-	@Autowired
-	private ISmsCheckCustomerInfoService smsCheckCustomerInfoService;
+    @Autowired
+    private ISmsCheckCustomerInfoService smsCheckCustomerInfoService;
+    @Autowired
+    private ShiroRealm shiroRealm;
+
 	 @Autowired
 	 private ISmsCheckWorkLogService workLogService;
 
-	 /**
-	  * 分页列表查询
-	  *
-	  * @param smsCheckCustomerInfo 对象
-	  * @param pageNo 页码
-	  * @param pageSize 每页条数
-	  * @param request 请求
-	  * @return 结果
-	  */
-	//@AutoLog(value = "客户信息-分页列表查询")
-	@ApiOperation(value="客户信息-分页列表查询", notes="客户信息-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<SmsCheckCustomerInfo>> queryPageList(SmsCheckCustomerInfo smsCheckCustomerInfo,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest request) {
-		QueryWrapper<SmsCheckCustomerInfo> queryWrapper = QueryGenerator.initQueryWrapper(smsCheckCustomerInfo, request.getParameterMap());
-		Page<SmsCheckCustomerInfo> page = new Page<>(pageNo, pageSize);
-		IPage<SmsCheckCustomerInfo> pageList = smsCheckCustomerInfoService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
+    /**
+     * 分页列表查询
+     *
+     * @param smsCheckCustomerInfo 对象
+     * @param pageNo               页码
+     * @param pageSize             每页条数
+     * @param request              请求
+     * @return 结果
+     */
+    //@AutoLog(value = "客户信息-分页列表查询")
+    @ApiOperation(value = "客户信息-分页列表查询", notes = "客户信息-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<SmsCheckCustomerInfo>> queryPageList(SmsCheckCustomerInfo smsCheckCustomerInfo,
+                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                             HttpServletRequest request) {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        QueryWrapper<SmsCheckCustomerInfo> queryWrapper = QueryGenerator.initQueryWrapper(smsCheckCustomerInfo, request.getParameterMap());
+        Page<SmsCheckCustomerInfo> page = new Page<>(pageNo, pageSize);
+        IPage<SmsCheckCustomerInfo> pageList = smsCheckCustomerInfoService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
 
-	 /**
-	  * 添加
-	  *
-	  * @param smsCheckCustomerInfo 对象
-	  * @return 结果
-	  */
-	@AutoLog(value = "客户信息-添加")
-	@ApiOperation(value="客户信息-添加", notes="客户信息-添加")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody SmsCheckCustomerInfo smsCheckCustomerInfo) {
-		smsCheckCustomerInfoService.save(smsCheckCustomerInfo);
-		return Result.OK("添加成功！");
-	}
+    /**
+     * 分页列表查询
+     *
+     * @param smsCheckCustomerInfo 对象
+     * @param pageNo               页码
+     * @param pageSize             每页条数
+     * @param request              请求
+     * @return 结果
+     */
+    //@AutoLog(value = "客户信息-分页列表查询")
+    @ApiOperation(value = "当前用户的客户信息-分页列表查询", notes = "当前用户的客户信息-分页列表查询")
+    @GetMapping(value = "staff/list")
+    public Result<IPage<SmsCheckCustomerInfo>> queryPageListStaffNo(SmsCheckCustomerInfo smsCheckCustomerInfo,
+                                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                    HttpServletRequest request) {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String workNo = sysUser.getWorkNo();
+        if (StringUtils.isEmpty(workNo)){
+            return Result.error("该用户不存在");
+        }
+        smsCheckCustomerInfo.setStaffNo(workNo);
+        QueryWrapper<SmsCheckCustomerInfo> queryWrapper = QueryGenerator.initQueryWrapper(smsCheckCustomerInfo, request.getParameterMap());
+        Page<SmsCheckCustomerInfo> page = new Page<>(pageNo, pageSize);
+        queryWrapper.orderByAsc("create_time");
+        IPage<SmsCheckCustomerInfo> pageList = smsCheckCustomerInfoService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
 
-	 /**
-	  * 编辑
-	  *
-	  * @param smsCheckCustomerInfo 对象
-	  * @return 结果
-	  */
-	@AutoLog(value = "客户信息-编辑")
-	@ApiOperation(value="客户信息-编辑", notes="客户信息-编辑")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody SmsCheckCustomerInfo smsCheckCustomerInfo) {
-		smsCheckCustomerInfoService.updateById(smsCheckCustomerInfo);
-		return Result.OK("编辑成功!");
-	}
-	
-	 /**
-	  * 通过id删除
-	  *
-	  * @param id 主键
-	  * @return 结果
-	  */
-	@AutoLog(value = "客户信息-通过id删除")
-	@ApiOperation(value="客户信息-通过id删除", notes="客户信息-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id") String id) {
-		smsCheckCustomerInfoService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	 /**
-	  * 批量删除
-	  *
-	  * @param ids 主键
-	  * @return 结果
-	  */
-	@AutoLog(value = "客户信息-批量删除")
-	@ApiOperation(value="客户信息-批量删除", notes="客户信息-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids") String ids) {
-		this.smsCheckCustomerInfoService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-	
-	 /**
-	  * 通过id查询
-	  *
-	  * @param id 主键
-	  * @return 数据
-	  */
-	//@AutoLog(value = "客户信息-通过id查询")
-	@ApiOperation(value="客户信息-通过id查询", notes="客户信息-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<SmsCheckCustomerInfo> queryById(@RequestParam(name="id") String id) {
-		SmsCheckCustomerInfo smsCheckCustomerInfo = smsCheckCustomerInfoService.getById(id);
-		if(smsCheckCustomerInfo==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(smsCheckCustomerInfo);
-	}
+    /**
+     * 添加
+     *
+     * @param smsCheckCustomerInfo 对象
+     * @return 结果
+     */
+    @AutoLog(value = "客户信息-添加")
+    @ApiOperation(value = "客户信息-添加", notes = "客户信息-添加")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody SmsCheckCustomerInfo smsCheckCustomerInfo) {
+        smsCheckCustomerInfoService.save(smsCheckCustomerInfo);
+        return Result.OK("添加成功！");
+    }
 
-	 /**
-	  * 导出excel
-	  *
-	  * @param request 请求
-	  * @param smsCheckCustomerInfo 对象
-	  * @return excel文件
-	  */
+
+
+    /**
+     * 添加
+     *
+     * @param smsCheckCustomerInfo 对象
+     * @return 结果
+     */
+    @AutoLog(value = "当前客户信息-添加")
+    @ApiOperation(value = "当前客户信息-添加", notes = "当前客户信息-添加")
+    @PostMapping(value = "/staff/add")
+    public Result<String> staffAdd(@RequestBody SmsCheckCustomerInfo smsCheckCustomerInfo) {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String workNo = sysUser.getWorkNo();
+        if (StringUtils.isEmpty(workNo)){
+            return Result.error("请重新登录");
+        }
+        if (StringUtils.isEmpty(smsCheckCustomerInfo.getUserNo())){
+            return Result.error("用户编号为空");
+        }
+        LambdaQueryWrapper<SmsCheckCustomerInfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SmsCheckCustomerInfo::getUserNo,smsCheckCustomerInfo.getUserNo());
+        List<SmsCheckCustomerInfo> list = smsCheckCustomerInfoService.list(queryWrapper);
+        if (list.size()>0){
+            return Result.error("该用户已经存在");
+        }
+        String realname = sysUser.getRealname();
+        smsCheckCustomerInfo.setStaffNo(workNo);
+        smsCheckCustomerInfo.setStaffName(realname);
+        smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_1);
+        smsCheckCustomerInfoService.save(smsCheckCustomerInfo);
+        return Result.OK("添加成功！");
+    }
+
+
+    @AutoLog(value = "客户信息-编辑")
+    @ApiOperation(value = "客户信息-编辑", notes = "客户信息-编辑")
+    @RequestMapping(value = "/edit/", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody SmsCheckCustomerInfo smsCheckCustomerInfo) {
+        smsCheckCustomerInfoService.updateById(smsCheckCustomerInfo);
+        return Result.OK("编辑成功!");
+    }
+
+
+    /**
+     * 通过id删除
+     *
+     * @param id 主键
+     * @return 结果
+     */
+    @AutoLog(value = "客户信息-通过id删除")
+    @ApiOperation(value = "客户信息-通过id删除", notes = "客户信息-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id") String id) {
+        smsCheckCustomerInfoService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids 主键
+     * @return 结果
+     */
+    @AutoLog(value = "客户信息-批量删除")
+    @ApiOperation(value = "客户信息-批量删除", notes = "客户信息-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids") String ids) {
+        this.smsCheckCustomerInfoService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id 主键
+     * @return 数据
+     */
+    //@AutoLog(value = "客户信息-通过id查询")
+    @ApiOperation(value = "客户信息-通过id查询", notes = "客户信息-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<SmsCheckCustomerInfo> queryById(@RequestParam(name = "id") String id) {
+        SmsCheckCustomerInfo smsCheckCustomerInfo = smsCheckCustomerInfoService.getById(id);
+        if (smsCheckCustomerInfo == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(smsCheckCustomerInfo);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request              请求
+     * @param smsCheckCustomerInfo 对象
+     * @return excel文件
+     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, SmsCheckCustomerInfo smsCheckCustomerInfo) {
         return super.exportXls(request, smsCheckCustomerInfo, SmsCheckCustomerInfo.class, "客户信息");
     }
 
-	 /**
-	  * 通过excel导入数据
-	  *
-	  * @param request 请求
-	  * @param response 响应
-	  * @return 导入结果
-	  */
+    /**
+     * 通过excel导入数据
+     *
+     * @param request  请求
+     * @param response 响应
+     * @return 导入结果
+     */
     @PostMapping(value = "/importExcel")
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, SmsCheckCustomerInfo.class);
     }
 
-	 /**
-	  * 通过id查询 稽核统计数
-	  *
-	  * @param id 主键
-	  * @return 数据
-	  */
-	 //@AutoLog(value = "客户信息-通过id查询")
-	 @ApiOperation(value="客户信息-通过id查询 稽核统计数", notes="客户信息-通过id查询 稽核统计数")
-	 @GetMapping(value = "/count")
-	 public Result<Dict> count(@RequestParam(name="id") String id) {
-		 Dict dict = Dict.create();
-		 // 客户总数
-		 long count = smsCheckCustomerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
-				 .eq(SmsCheckCustomerInfo::getTaskId, id)
-				 .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
-		 // 未处理数
-		 long undoCount = smsCheckCustomerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
-				 .eq(SmsCheckCustomerInfo::getTaskId, id)
-				 .in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(0,1))
-				 .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
-
-		 // 待稽核数
-		 long uncheckCount = smsCheckCustomerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
-				 .eq(SmsCheckCustomerInfo::getTaskId, id)
-				 .in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(2,4))
-				 .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
-		 // 待整改数
-		 long checkedCount = smsCheckCustomerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
-				 .eq(SmsCheckCustomerInfo::getTaskId, id)
-				 .eq(SmsCheckCustomerInfo::getCheckState, 3)
-				 .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
-		 // 稽核完成数
-		 long passedCount = smsCheckCustomerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
-				 .eq(SmsCheckCustomerInfo::getTaskId, id)
-				 .eq(SmsCheckCustomerInfo::getCheckState, 5)
-				 .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
-
-		 dict.put("count", count);
-		 dict.put("undoCount", undoCount);
-		 dict.put("uncheckCount", uncheckCount);
-		 dict.put("checkedCount", checkedCount);
-		 dict.put("passedCount", passedCount);
-
-		 return Result.OK(dict);
-	 }
+    /**
+     * 通过id查询 稽核统计数
+     *
+     * @param id 主键
+     * @return 数据
+     */
+    //@AutoLog(value = "客户信息-通过id查询")
+    @ApiOperation(value = "客户信息-通过id查询 稽核统计数", notes = "客户信息-通过id查询 稽核统计数")
+    @GetMapping(value = "/count")
+    public Result<Dict> count(@RequestParam(name = "id") String id) {
+        Dict dict = Dict.create();
+        // 客户总数
+        long count = smsCheckCustomerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
+                .eq(SmsCheckCustomerInfo::getTaskId, id)
+                .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
+        // 未处理数
+        long undoCount = smsCheckCustomerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
+                .eq(SmsCheckCustomerInfo::getTaskId, id)
+                .in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(0, 1))
+                .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
+
+        // 待稽核数
+        long uncheckCount = smsCheckCustomerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
+                .eq(SmsCheckCustomerInfo::getTaskId, id)
+                .in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(2, 4))
+                .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
+        // 待整改数
+        long checkedCount = smsCheckCustomerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
+                .eq(SmsCheckCustomerInfo::getTaskId, id)
+                .eq(SmsCheckCustomerInfo::getCheckState, 3)
+                .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
+        // 稽核完成数
+        long passedCount = smsCheckCustomerInfoService.count(new LambdaQueryWrapper<SmsCheckCustomerInfo>()
+                .eq(SmsCheckCustomerInfo::getTaskId, id)
+                .eq(SmsCheckCustomerInfo::getCheckState, 5)
+                .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
+
+        dict.put("count", count);
+        dict.put("undoCount", undoCount);
+        dict.put("uncheckCount", uncheckCount);
+        dict.put("checkedCount", checkedCount);
+        dict.put("passedCount", passedCount);
+
+        return Result.OK(dict);
+    }
 
 	 /**
 	  * 稽核客户信息
@@ -237,4 +308,7 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
 		 return Result.error("稽核失败!");
 	}
 
+
+
+
  }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/OSSFile.java

@@ -0,0 +1,42 @@
+package org.jeecg.modules.smscheck.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.system.base.entity.JeecgEntity;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @Description: oss云存储实体类
+ * @author: jeecg-boot
+ */
+@Data
+@TableName("oss_file")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class OSSFile extends JeecgEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@Excel(name = "文件名称")
+	private String fileName;
+
+	@Excel(name = "原始文件类型")
+	private String fileType;
+
+	@Excel(name = "文件类型")
+	private String searchFileType;
+
+	@Excel(name = "文件大小")
+	private Long fileSize;
+
+	@Excel(name = "文件真实名称")
+	private String realName;
+
+	@Excel(name = "文件地址")
+	private String url;
+
+	@Excel(name = "机构代码")
+	private String sysOrgCode;
+}

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsCheckCustomerData.java

@@ -39,6 +39,10 @@ public class SmsCheckCustomerData implements Serializable {
     @Excel(name = "客户id", width = 15)
     @ApiModelProperty(value = "客户id")
     private String infoId;
+
+    @Excel(name = "用户编号", width = 15)
+    @ApiModelProperty(value = "用户编号")
+    private String userNo;
 	/** 业务合同 */
     @Excel(name = "业务合同", width = 15)
     @ApiModelProperty(value = "业务合同")

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/IOSSFileService.java

@@ -0,0 +1,30 @@
+package org.jeecg.modules.smscheck.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import org.jeecg.modules.smscheck.entity.OSSFile;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+/**
+ * @Description: OOS云存储service接口
+ * @author: jeecg-boot
+ */
+public interface IOSSFileService extends IService<OSSFile> {
+
+    /**
+     * oss文件上传
+     * @param multipartFile
+     * @throws IOException
+     */
+	void upload(MultipartFile multipartFile) throws IOException;
+
+    /**
+     * oss文件删除
+     * @param ossFile OSSFile对象
+     * @return
+     */
+	boolean delete(OSSFile ossFile);
+
+}