fix(ys-应急):专家列表修改

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/java/com/yeejoin/amos/boot/module/ys/api/service/IYsEmergencyExpertsService.java

@@ -19,6 +19,8 @@ public interface IYsEmergencyExpertsService {
 
     Boolean saveOrUpdate (Map<String, Object> model, AgencyUserModel userModel);
 
+    Boolean deleteById (String sequenceNbr);
+
     YsEmergencyExpertsDto queryBySequenceNbr (String sequenceNbr);
 
     ResponseModel<Object> expertDataImport(MultipartFile file);

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/controller/CommonController.java

@@ -3,16 +3,9 @@ package com.yeejoin.amos.boot.module.ys.biz.controller;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.ys.biz.service.CommonService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
-import javax.servlet.http.HttpServletResponse;
 
 /**
  *
@@ -27,10 +20,10 @@ public class CommonController extends BaseController {
 	@Autowired
 	private CommonService commonService;
 
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "模板下载",  notes = "模板下载")
-	@RequestMapping(value = "/templateDownload", method = RequestMethod.GET)
-	public void queryForPage(HttpServletResponse response, @RequestParam(value = "path") String path) {
-		commonService.templateDownload(response,path);
-	}
+//	@TycloudOperation(ApiLevel = UserType.AGENCY)
+//	@ApiOperation(httpMethod = "GET",value = "模板下载",  notes = "模板下载")
+//	@RequestMapping(value = "/templateDownload", method = RequestMethod.GET)
+//	public void queryForPage(HttpServletResponse response, @RequestParam(value = "path") String path) {
+//		commonService.templateDownload(response,path);
+//	}
 }

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/controller/YsEmergencyExpertsController.java

@@ -18,7 +18,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
@@ -74,10 +73,10 @@ public class YsEmergencyExpertsController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
+    @DeleteMapping(value = "/deleteById")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(ysEmergencyExpertsServiceImpl.removeById(sequenceNbr));
+    public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbr") String sequenceNbr){
+        return ResponseHelper.buildResponse(iYsEmergencyExpertsService.deleteById(sequenceNbr));
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/service/CommonService.java

 package com.yeejoin.amos.boot.module.ys.biz.service;
 
-import javax.servlet.http.HttpServletResponse;
-
 public interface CommonService {
 
-    void templateDownload(HttpServletResponse response, String type);
 
 }

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/service/impl/CommonServiceImpl.java

 package com.yeejoin.amos.boot.module.ys.biz.service.impl;
 
 import com.yeejoin.amos.boot.module.ys.biz.service.CommonService;
-import com.yeejoin.amos.feign.systemctl.Systemctl;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * 公共服务实现类
  *
@@ -14,16 +11,5 @@ import javax.servlet.http.HttpServletResponse;
  */
 @Service
 public class CommonServiceImpl implements CommonService {
-    /**
-     * 模板下载
-     * @param response 响应
-     * @param type 类型
-     * @return 模板文件
-     */
-    @Override
-    public void templateDownload(HttpServletResponse response, String path) {
-        // TODO 调用异常
-//        Systemctl.fileStorageClient.downloadFile(response, "upload/tzs/common/fileTemplate/专家库数据导入模板.xlsx", null);
-        Systemctl.fileStorageClient.downloadFile(response, path, null);
-    }
+
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/service/impl/YsEmergencyExpertsServiceImpl.java

@@ -9,6 +9,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 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.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
 import com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyExpertsDto;
@@ -47,7 +49,7 @@ public class YsEmergencyExpertsServiceImpl extends BaseService<YsEmergencyExpert
      * 分页查询
      */
     public Page<Map<String, Object>> queryForYsEmergencyExpertsPage(YsEmergencyExpertsDto dto, Page<Map<String, Object>> page) {
-        return this.baseMapper.pageList(page,dto);
+        return this.baseMapper.pageList(page, dto);
     }
 
     /**
@@ -62,7 +64,7 @@ public class YsEmergencyExpertsServiceImpl extends BaseService<YsEmergencyExpert
     public Boolean saveOrUpdate(Map<String, Object> model, AgencyUserModel userModel) {
         YsEmergencyExperts experts = JSON.parseObject(JSONObject.toJSONString(model), YsEmergencyExperts.class);
         experts.setIsDelete(Boolean.FALSE);
-        if (ValidationUtil.isEmpty(experts.getSequenceNbr())){//新增
+        if (ValidationUtil.isEmpty(experts.getSequenceNbr())) {//新增
             experts.setCreateDate(new Date());
             experts.setCreateUserId(userModel.getUserId());
             experts.setCreateUserName(userModel.getUserName());
@@ -72,13 +74,21 @@ public class YsEmergencyExpertsServiceImpl extends BaseService<YsEmergencyExpert
     }
 
     @Override
+    public Boolean deleteById(String sequenceNbr) {
+        LambdaUpdateWrapper<YsEmergencyExperts> lambda = new UpdateWrapper<YsEmergencyExperts>().lambda();
+        lambda.eq(YsEmergencyExperts::getSequenceNbr, sequenceNbr);
+        lambda.set(YsEmergencyExperts::getIsDelete, Boolean.TRUE);
+        return this.update(lambda);
+    }
+
+    @Override
     public YsEmergencyExpertsDto queryBySequenceNbr(String sequenceNbr) {
         YsEmergencyExpertsDto expertsDto = new YsEmergencyExpertsDto();
         LambdaQueryWrapper<YsEmergencyExperts> lambda = new QueryWrapper<YsEmergencyExperts>().lambda();
         lambda.eq(YsEmergencyExperts::getSequenceNbr, sequenceNbr);
         YsEmergencyExperts experts = this.baseMapper.selectOne(lambda);
-        BeanUtils.copyProperties(experts,expertsDto);
-        if (!ValidationUtil.isEmpty(experts.getPhoto())){
+        BeanUtils.copyProperties(experts, expertsDto);
+        if (!ValidationUtil.isEmpty(experts.getPhoto())) {
             expertsDto.setPhoto(JSON.parseArray((experts.getPhoto())));
         }
         return expertsDto;