yunxi
/
ningxiaWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix():自测问题修复;

Browse Source
master
jiyufei 4 months ago
parent 5ec9e9f7ac
commit 5f0eedbd10
6 changed files with 111 additions and 81 deletions
Show Stats Download Patch File Download Diff File

2
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleDeviceConfigService.java
Unescape View File

@ -34,7 +34,7 @@ public interface RecycleDeviceConfigService extends IService<RecycleDeviceConfig
RecycleDeviceConfigEntity getByOrganize(String organizeJsonId); RecycleDeviceConfigEntity getByOrganize(String organizeJsonId);
void saveOrUpdate(RecycleDeviceConfigForm recycleDeviceConfigForm, String id, boolean isSave) throws Exception; String saveOrUpdate(RecycleDeviceConfigForm recycleDeviceConfigForm, String id, boolean isSave);
/** /**
* 查询统一配置 * 查询统一配置

8
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java
Unescape View File

@ -513,7 +513,7 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
if (isSave) { if (isSave) {
String mainId = RandomUtil.uuId(); String mainId = RandomUtil.uuId();
entity.setOrderNo(generaterSwapUtil.getBillNumber("deliveryOrderCode", false)); entity.setOrderNo(generaterSwapUtil.getBillNumber("deliveryOrderCode", false));
entity.setCompanyId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all")); // entity.setCompanyId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
entity.setLastModifyTime(null); entity.setLastModifyTime(null);
entity.setLastModifyUserId(null); entity.setLastModifyUserId(null);
entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all")); entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
@ -521,11 +521,11 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
entity.setCreatorUserId(userInfo.getUserId()); entity.setCreatorUserId(userInfo.getUserId());
entity.setId(mainId); entity.setId(mainId);
} else { } else {
entity.setOrderNo(generaterSwapUtil.getBillNumber("deliveryOrderCode", false)); // entity.setOrderNo(generaterSwapUtil.getBillNumber("deliveryOrderCode", false));
entity.setCompanyId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all")); // entity.setCompanyId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
entity.setLastModifyTime(null); entity.setLastModifyTime(null);
entity.setLastModifyUserId(null); entity.setLastModifyUserId(null);
entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all")); // entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
entity.setCreatorTime(DateUtil.getNowDate()); entity.setCreatorTime(DateUtil.getNowDate());
entity.setCreatorUserId(userInfo.getUserId()); entity.setCreatorUserId(userInfo.getUserId());
} }

14
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceConfigServiceImpl.java
Unescape View File

@ -386,7 +386,8 @@ public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceCon
*/ */
@Override @Override
@Transactional @Transactional
public void saveOrUpdate(RecycleDeviceConfigForm recycleDeviceConfigForm, String id, boolean isSave) throws Exception { public String saveOrUpdate(RecycleDeviceConfigForm recycleDeviceConfigForm, String id, boolean isSave) {
String result;
UserInfo userInfo = userProvider.get(); UserInfo userInfo = userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId()); UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
recycleDeviceConfigForm = JsonUtil.getJsonToBean( recycleDeviceConfigForm = JsonUtil.getJsonToBean(
@ -398,7 +399,8 @@ public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceCon
List<RecycleDeviceConfigEntity> list = this.list(wrapper); List<RecycleDeviceConfigEntity> list = this.list(wrapper);
if (isSave) { if (isSave) {
if (CollectionUtils.isNotEmpty(list)) { if (CollectionUtils.isNotEmpty(list)) {
throw new RuntimeException("已存在该组织架构！"); result = "已存在该组织架构！";
return result;
} }
String mainId = RandomUtil.uuId(); String mainId = RandomUtil.uuId();
entity.setLastModifyUserId(null); entity.setLastModifyUserId(null);
@ -414,7 +416,13 @@ public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceCon
// entity.setCompanyId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all")); // entity.setCompanyId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
// entity.setDepartmentId(userEntity.getPositionId()); // entity.setDepartmentId(userEntity.getPositionId());
} }
this.saveOrUpdate(entity); boolean saveOrUpdate = this.saveOrUpdate(entity);
if (saveOrUpdate) {
result = "新增成功";
return result;
}
result = "新增失败";
return result;
} }
@Override @Override

13
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeliveryOrderController.java
Unescape View File

@ -8,18 +8,22 @@ import jnpf.base.vo.PaginationVO;
import jnpf.entity.RecycleDeliveryOrderEntity; import jnpf.entity.RecycleDeliveryOrderEntity;
import jnpf.model.recycledeliveryorder.*; import jnpf.model.recycledeliveryorder.*;
import jnpf.service.RecycleDeliveryOrderService; import jnpf.service.RecycleDeliveryOrderService;
import jnpf.service.RecycleDeviceService;
import jnpf.util.GeneraterSwapUtil; import jnpf.util.GeneraterSwapUtil;
import jnpf.util.JsonUtil; import jnpf.util.JsonUtil;
import jnpf.util.StringUtil; import jnpf.util.StringUtil;
import jnpf.util.UserProvider; import jnpf.util.UserProvider;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid; import javax.validation.Valid;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -46,6 +50,9 @@ public class RecycleDeliveryOrderController {
@Autowired @Autowired
private RecycleDeliveryOrderService recycleDeliveryOrderService; private RecycleDeliveryOrderService recycleDeliveryOrderService;
@Resource
private RecycleDeviceService recycleDeviceService;
/** /**
* 列表 * 列表
@ -90,6 +97,12 @@ public class RecycleDeliveryOrderController {
return ActionResult.fail(b); return ActionResult.fail(b);
} }
try { try {
//查询设备 所绑定的商户 赋值
List<String> companyId = recycleDeviceService.getInfoByDeviceCode(Collections.singletonList(recycleDeliveryOrderForm.getDeviceCode()));
if (CollectionUtils.isNotEmpty(companyId)) {
//只会查询出来一个
recycleDeliveryOrderForm.setCompanyId(companyId.get(0));
}
recycleDeliveryOrderService.saveOrUpdate(recycleDeliveryOrderForm, null, true); recycleDeliveryOrderService.saveOrUpdate(recycleDeliveryOrderForm, null, true);
} catch (Exception e) { } catch (Exception e) {
return ActionResult.fail("新增数据失败"); return ActionResult.fail("新增数据失败");

153
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceConfigController.java
Unescape View File

@ -15,22 +15,27 @@ import jnpf.model.recycledeviceconfig.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.*; import java.util.*;
import jnpf.annotation.JnpfField; import jnpf.annotation.JnpfField;
import jnpf.base.vo.PageListVO; import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO; import jnpf.base.vo.PaginationVO;
import jnpf.base.vo.DownloadVO; import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil; import jnpf.config.ConfigValueUtil;
import jnpf.base.entity.ProvinceEntity; import jnpf.base.entity.ProvinceEntity;
import java.io.IOException; import java.io.IOException;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import jnpf.engine.entity.FlowTaskEntity; import jnpf.engine.entity.FlowTaskEntity;
import jnpf.exception.WorkFlowException; import jnpf.exception.WorkFlowException;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
/** /**
* 投递柜配置 * 投递柜配置
*
* @版本： V3.5 * @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组 * @作者： JNPF开发平台组
@ -38,7 +43,7 @@ import org.springframework.transaction.annotation.Transactional;
*/ */
@Slf4j @Slf4j
@RestController @RestController
@Tag(name = "投递柜配置" , description = "scm") @Tag(name = "投递柜配置", description = "scm")
@RequestMapping("/api/scm/RecycleDeviceConfig") @RequestMapping("/api/scm/RecycleDeviceConfig")
public class RecycleDeviceConfigController { public class RecycleDeviceConfigController {
@ -52,27 +57,26 @@ public class RecycleDeviceConfigController {
private RecycleDeviceConfigService recycleDeviceConfigService; private RecycleDeviceConfigService recycleDeviceConfigService;
/** /**
* 列表 * 列表
* *
* @param recycleDeviceConfigPagination * @param recycleDeviceConfigPagination
* @return * @return
*/ */
@Operation(summary = "获取列表") @Operation(summary = "获取列表")
@PostMapping("/getList") @PostMapping("/getList")
public ActionResult list(@RequestBody RecycleDeviceConfigPagination recycleDeviceConfigPagination)throws IOException{ public ActionResult list(@RequestBody RecycleDeviceConfigPagination recycleDeviceConfigPagination) throws IOException {
List<RecycleDeviceConfigEntity> list= recycleDeviceConfigService.getList(recycleDeviceConfigPagination); List<RecycleDeviceConfigEntity> list = recycleDeviceConfigService.getList(recycleDeviceConfigPagination);
List<Map<String, Object>> realList=new ArrayList<>(); List<Map<String, Object>> realList = new ArrayList<>();
for (RecycleDeviceConfigEntity entity : list) { for (RecycleDeviceConfigEntity entity : list) {
Map<String, Object> recycleDeviceConfigMap=JsonUtil.entityToMap(entity); Map<String, Object> recycleDeviceConfigMap = JsonUtil.entityToMap(entity);
recycleDeviceConfigMap.put("id", recycleDeviceConfigMap.get("id")); recycleDeviceConfigMap.put("id", recycleDeviceConfigMap.get("id"));
//副表数据 //副表数据
//子表数据 //子表数据
realList.add(recycleDeviceConfigMap); realList.add(recycleDeviceConfigMap);
} }
//数据转换 //数据转换
realList = generaterSwapUtil.swapDataList(realList, RecycleDeviceConfigConstant.getFormData(), RecycleDeviceConfigConstant.getColumnData(), recycleDeviceConfigPagination.getModuleId(),false); realList = generaterSwapUtil.swapDataList(realList, RecycleDeviceConfigConstant.getFormData(), RecycleDeviceConfigConstant.getColumnData(), recycleDeviceConfigPagination.getModuleId(), false);
//返回对象 //返回对象
PageListVO vo = new PageListVO(); PageListVO vo = new PageListVO();
@ -81,109 +85,114 @@ public class RecycleDeviceConfigController {
vo.setPagination(page); vo.setPagination(page);
return ActionResult.success(vo); return ActionResult.success(vo);
} }
/** /**
* 创建 * 创建
* *
* @param recycleDeviceConfigForm * @param recycleDeviceConfigForm
* @return * @return
*/ */
@PostMapping() @PostMapping()
@Operation(summary = "创建") @Operation(summary = "创建")
public ActionResult create(@RequestBody @Valid RecycleDeviceConfigForm recycleDeviceConfigForm) { public ActionResult create(@RequestBody @Valid RecycleDeviceConfigForm recycleDeviceConfigForm) {
String b = recycleDeviceConfigService.checkForm(recycleDeviceConfigForm,0); String b = recycleDeviceConfigService.checkForm(recycleDeviceConfigForm, 0);
if (StringUtil.isNotEmpty(b)){ if (StringUtil.isNotEmpty(b)) {
return ActionResult.fail(b ); return ActionResult.fail(b);
} }
try{ String result = recycleDeviceConfigService.saveOrUpdate(recycleDeviceConfigForm, null, true);
recycleDeviceConfigService.saveOrUpdate(recycleDeviceConfigForm, null ,true); return ActionResult.success(result);
}catch(Exception e){
return ActionResult.fail("新增数据失败");
}
return ActionResult.success("创建成功");
} }
/** /**
* 编辑 * 编辑
* @param id *
* @param recycleDeviceConfigForm * @param id
* @return * @param recycleDeviceConfigForm
*/ * @return
*/
@PutMapping("/{id}") @PutMapping("/{id}")
@Operation(summary = "更新") @Operation(summary = "更新")
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid RecycleDeviceConfigForm recycleDeviceConfigForm, public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid RecycleDeviceConfigForm recycleDeviceConfigForm,
@RequestParam(value = "isImport", required = false) boolean isImport){ @RequestParam(value = "isImport", required = false) boolean isImport) {
recycleDeviceConfigForm.setId(id); recycleDeviceConfigForm.setId(id);
if (!isImport) { if (!isImport) {
String b = recycleDeviceConfigService.checkForm(recycleDeviceConfigForm,1); String b = recycleDeviceConfigService.checkForm(recycleDeviceConfigForm, 1);
if (StringUtil.isNotEmpty(b)){ if (StringUtil.isNotEmpty(b)) {
return ActionResult.fail(b ); return ActionResult.fail(b);
} }
} }
RecycleDeviceConfigEntity entity= recycleDeviceConfigService.getInfo(id); RecycleDeviceConfigEntity entity = recycleDeviceConfigService.getInfo(id);
if(entity!=null){ if (entity != null) {
try{ try {
recycleDeviceConfigService.saveOrUpdate(recycleDeviceConfigForm,id,false); recycleDeviceConfigService.saveOrUpdate(recycleDeviceConfigForm, id, false);
}catch(Exception e){ } catch (Exception e) {
return ActionResult.fail("修改数据失败"); return ActionResult.fail("修改数据失败");
} }
return ActionResult.success("更新成功"); return ActionResult.success("更新成功");
}else{ } else {
return ActionResult.fail("更新失败，数据不存在"); return ActionResult.fail("更新失败，数据不存在");
} }
} }
/** /**
* 删除 * 删除
* @param id *
* @return * @param id
*/ * @return
*/
@Operation(summary = "删除") @Operation(summary = "删除")
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
@Transactional @Transactional
public ActionResult delete(@PathVariable("id") String id){ public ActionResult delete(@PathVariable("id") String id) {
RecycleDeviceConfigEntity entity= recycleDeviceConfigService.getInfo(id); RecycleDeviceConfigEntity entity = recycleDeviceConfigService.getInfo(id);
if(entity!=null){ if (entity != null) {
//主表数据删除 //主表数据删除
recycleDeviceConfigService.delete(entity); recycleDeviceConfigService.delete(entity);
} }
return ActionResult.success("删除成功"); return ActionResult.success("删除成功");
} }
/** /**
* 表单信息(详情页) * 表单信息(详情页)
* 详情页面使用-转换数据 * 详情页面使用-转换数据
* @param id *
* @return * @param id
*/ * @return
*/
@Operation(summary = "表单信息(详情页)") @Operation(summary = "表单信息(详情页)")
@GetMapping("/detail/{id}") @GetMapping("/detail/{id}")
public ActionResult detailInfo(@PathVariable("id") String id){ public ActionResult detailInfo(@PathVariable("id") String id) {
RecycleDeviceConfigEntity entity= recycleDeviceConfigService.getInfo(id); RecycleDeviceConfigEntity entity = recycleDeviceConfigService.getInfo(id);
if(entity==null){ if (entity == null) {
return ActionResult.fail("表单数据不存在！"); return ActionResult.fail("表单数据不存在！");
} }
Map<String, Object> recycleDeviceConfigMap=JsonUtil.entityToMap(entity); Map<String, Object> recycleDeviceConfigMap = JsonUtil.entityToMap(entity);
recycleDeviceConfigMap.put("id", recycleDeviceConfigMap.get("id")); recycleDeviceConfigMap.put("id", recycleDeviceConfigMap.get("id"));
//副表数据 //副表数据
//子表数据 //子表数据
recycleDeviceConfigMap = generaterSwapUtil.swapDataDetail(recycleDeviceConfigMap,RecycleDeviceConfigConstant.getFormData(),"565858748388610501",false); recycleDeviceConfigMap = generaterSwapUtil.swapDataDetail(recycleDeviceConfigMap, RecycleDeviceConfigConstant.getFormData(), "565858748388610501", false);
return ActionResult.success(recycleDeviceConfigMap); return ActionResult.success(recycleDeviceConfigMap);
} }
/** /**
* 获取详情(编辑页) * 获取详情(编辑页)
* 编辑页面使用-不转换数据 * 编辑页面使用-不转换数据
* @param id *
* @return * @param id
*/ * @return
*/
@Operation(summary = "信息") @Operation(summary = "信息")
@GetMapping("/{id}") @GetMapping("/{id}")
public ActionResult info(@PathVariable("id") String id){ public ActionResult info(@PathVariable("id") String id) {
RecycleDeviceConfigEntity entity= recycleDeviceConfigService.getInfo(id); RecycleDeviceConfigEntity entity = recycleDeviceConfigService.getInfo(id);
if(entity==null){ if (entity == null) {
return ActionResult.fail("表单数据不存在！"); return ActionResult.fail("表单数据不存在！");
} }
Map<String, Object> recycleDeviceConfigMap=JsonUtil.entityToMap(entity); Map<String, Object> recycleDeviceConfigMap = JsonUtil.entityToMap(entity);
recycleDeviceConfigMap.put("id", recycleDeviceConfigMap.get("id")); recycleDeviceConfigMap.put("id", recycleDeviceConfigMap.get("id"));
//副表数据 //副表数据
//子表数据 //子表数据
recycleDeviceConfigMap = generaterSwapUtil.swapDataForm(recycleDeviceConfigMap,RecycleDeviceConfigConstant.getFormData(),RecycleDeviceConfigConstant.TABLEFIELDKEY,RecycleDeviceConfigConstant.TABLERENAMES); recycleDeviceConfigMap = generaterSwapUtil.swapDataForm(recycleDeviceConfigMap, RecycleDeviceConfigConstant.getFormData(), RecycleDeviceConfigConstant.TABLEFIELDKEY, RecycleDeviceConfigConstant.TABLERENAMES);
return ActionResult.success(recycleDeviceConfigMap); return ActionResult.success(recycleDeviceConfigMap);
} }

2
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledeliveryorder/RecycleDeliveryOrderForm.java
Unescape View File

@ -103,7 +103,7 @@ public class RecycleDeliveryOrderForm {
* 投递照片 * 投递照片
**/ **/
@JsonProperty("photo") @JsonProperty("photo")
private String photo; private Object photo;
/** /**
* 机柜单号 * 机柜单号
**/ **/

Write Preview
Loading…
Cancel
Save