Browse Source

根据deviceNo获取manCont

master
liwenxuan 7 months ago
parent
commit
f1ac804985
  1. 56
      src/main/java/com/hxgk/lowcode/controller/ManContController.java
  2. 9
      src/main/java/com/hxgk/lowcode/model/entity/ManCont.java
  3. 2
      src/main/java/com/hxgk/lowcode/service/UserService.java
  4. 4
      src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java
  5. 20
      src/main/java/com/hxgk/lowcode/service/impl/UserServiceImpl.java

56
src/main/java/com/hxgk/lowcode/controller/ManContController.java

@ -0,0 +1,56 @@
package com.hxgk.lowcode.controller;
import com.hxgk.lowcode.model.entity.ManCont;
import com.hxgk.lowcode.model.entity.Tree;
import com.hxgk.lowcode.service.UserService;
import com.hxgk.lowcode.utils.JsonData;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
@RestController
@RequestMapping("/lowCode/manCont")
public class ManContController {
@Autowired
UserService userService;
/*根据主表id拿到表单字段信息*/
@RequestMapping(value = "getManCont")
public JsonData getFieldTree(@RequestBody Map<String,String> requestBody) {
String paramType = requestBody.get("paramType");
String paramValue = requestBody.get("paramValue");
if(!StringUtils.isBlank(paramType)){
if(paramType.equals("deviceNo")){
if(!StringUtils.isBlank(paramValue)){
ManCont manCont = userService.getManContByDeviceNo(paramType,paramValue);
return JsonData.buildSuccess(manCont);
}else{
return JsonData.buildError("paramValue 非法,isBlank");
}
}else{
return JsonData.buildError("paramType 非法,仅支持deviceNo");
}
}else{
return JsonData.buildError("paramType 非法, isBlank");
}
/*if(tree.getId()==null){
return JsonData.buildError("查无此表单");
}else{
if(tree.getId().equals("cfid为空")){
return JsonData.buildSuccess(tree);
}else if(tree.getId().equals("masterTable为null")){
return JsonData.buildSuccess(tree);
}
return JsonData.buildSuccess(tree);
}*/
}
}

9
src/main/java/com/hxgk/lowcode/model/entity/ManCont.java

@ -123,7 +123,16 @@ public class ManCont {
private String responsibleDepartment; private String responsibleDepartment;
//负责的行政组织json //负责的行政组织json
private String responsibleDepartmentJson; private String responsibleDepartmentJson;
//定位卡标签编码
private String deviceNo;
public String getDeviceNo() {
return deviceNo;
}
public void setDeviceNo(String deviceNo) {
this.deviceNo = deviceNo;
}
public Long getId() { public Long getId() {
return id; return id;

2
src/main/java/com/hxgk/lowcode/service/UserService.java

@ -19,4 +19,6 @@ public interface UserService {
ManCont getManContByKey(String key); ManCont getManContByKey(String key);
List<Tree> getManContListByAdminOrg(String adminOrg); List<Tree> getManContListByAdminOrg(String adminOrg);
ManCont getManContByDeviceNo(String paramType,String paramValue);
} }

4
src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java

@ -536,8 +536,8 @@ public class CustomerFormServiceImpl implements CustomerFormService {
String onlyToShowTableId = ""; String onlyToShowTableId = "";
//上线修改 //上线修改
//String url = "http://172.20.2.87:7777/customer_form/gainTableVersionField";//本地+内网 String url = "http://172.20.2.87:7777/customer_form/gainTableVersionField";//本地+内网
String url = "http://36.133.126.182:39250/customer_form/gainTableVersionField";//外网 //String url = "http://36.133.126.182:39250/customer_form/gainTableVersionField";//外网
if(cfid.contains("zibiaoid-")){ if(cfid.contains("zibiaoid-")){
onlyToShowTableId = cfid.split("zibiaoid-")[1]; onlyToShowTableId = cfid.split("zibiaoid-")[1];
cfid = cfid.split(":")[0];//当选择某个主表的子表时,连主表数据一并返回。 cfid = cfid.split(":")[0];//当选择某个主表的子表时,连主表数据一并返回。

20
src/main/java/com/hxgk/lowcode/service/impl/UserServiceImpl.java

@ -123,5 +123,25 @@ public class UserServiceImpl implements UserService {
return manConts; return manConts;
} }
/**
* 根据定位卡机器码获取manCont
* @param paramType
* @param paramValue
* @return
*/
@DS("hrnew")
@Override
public ManCont getManContByDeviceNo(String paramType,String paramValue) {
//先从科远库查出该paramValue对应的工号
String number = getNumberByDeviceNo(paramValue);
return null;
}
private String getNumberByDeviceNo(String paramValue) {
return null;
}
} }

Loading…
Cancel
Save