代码重新生成

master
guochaojie 4 months ago
parent 9089f2e435
commit 3e1eeae101

@ -5,11 +5,11 @@ import jnpf.entity.RecycleDeviceEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* *
* V3.5 * V3.5
* https://www.jnpfsoft.com * https://www.jnpfsoft.com
* JNPF * JNPF
* 2024-06-21 * 2024-06-22
*/ */
public interface RecycleDeviceMapper extends BaseMapper<RecycleDeviceEntity> { public interface RecycleDeviceMapper extends BaseMapper<RecycleDeviceEntity> {

@ -32,4 +32,5 @@ public interface RecycleCameraService extends IService<RecycleCameraEntity> {
void saveOrUpdate(RecycleCameraForm recycleCameraForm,String id, boolean isSave) throws Exception; void saveOrUpdate(RecycleCameraForm recycleCameraForm,String id, boolean isSave) throws Exception;
List<RecycleCameraEntity> getByDeviceCode(String deviceCode);
} }

@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
* V3.5 * V3.5
* https://www.jnpfsoft.com * https://www.jnpfsoft.com
* JNPF * JNPF
* 2024-06-21 * 2024-06-22
*/ */
public interface RecycleDeviceService extends IService<RecycleDeviceEntity> { public interface RecycleDeviceService extends IService<RecycleDeviceEntity> {
List<RecycleDeviceEntity> getList(RecycleDevicePagination recycleDevicePagination); List<RecycleDeviceEntity> getList(RecycleDevicePagination recycleDevicePagination);

@ -32,4 +32,6 @@ public interface SimCardService extends IService<SimCardEntity> {
void saveOrUpdate(SimCardForm simCardForm,String id, boolean isSave) throws Exception; void saveOrUpdate(SimCardForm simCardForm,String id, boolean isSave) throws Exception;
SimCardEntity getByDeviceCode(String deviceCode);
} }

@ -5,18 +5,26 @@ import jnpf.mapper.RecycleCameraMapper;
import jnpf.service.*; import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.recyclecamera.*; import jnpf.model.recyclecamera.*;
import java.math.BigDecimal; import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import jnpf.permission.model.authorize.AuthorizeConditionModel; import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.util.GeneraterSwapUtil; import jnpf.util.GeneraterSwapUtil;
import jnpf.database.model.superQuery.SuperQueryJsonModel; import jnpf.database.model.superQuery.SuperQueryJsonModel;
import jnpf.database.model.superQuery.ConditionJsonModel; import jnpf.database.model.superQuery.ConditionJsonModel;
import jnpf.database.model.superQuery.SuperQueryConditionModel; import jnpf.database.model.superQuery.SuperQueryConditionModel;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import jnpf.model.QueryModel; import jnpf.model.QueryModel;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel; import jnpf.base.model.ColumnDataModel;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@ -25,13 +33,17 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import jnpf.util.*; import jnpf.util.*;
import java.util.*; import java.util.*;
import jnpf.base.UserInfo; import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity; import jnpf.permission.entity.UserEntity;
/** /**
*
* RecycleCamera * RecycleCamera
* V3.5 * V3.5
* https://www.jnpfsoft.com * https://www.jnpfsoft.com
@ -39,7 +51,7 @@ import jnpf.permission.entity.UserEntity;
* 2024-05-30 * 2024-05-30
*/ */
@Service @Service
public class RecycleCameraServiceImpl extends ServiceImpl<RecycleCameraMapper, RecycleCameraEntity> implements RecycleCameraService{ public class RecycleCameraServiceImpl extends ServiceImpl<RecycleCameraMapper, RecycleCameraEntity> implements RecycleCameraService {
@Autowired @Autowired
private GeneraterSwapUtil generaterSwapUtil; private GeneraterSwapUtil generaterSwapUtil;
@ -47,262 +59,281 @@ public class RecycleCameraServiceImpl extends ServiceImpl<RecycleCameraMapper, R
private UserProvider userProvider; private UserProvider userProvider;
@Override @Override
public List<RecycleCameraEntity> getList(RecycleCameraPagination recycleCameraPagination){ public List<RecycleCameraEntity> getList(RecycleCameraPagination recycleCameraPagination) {
return getTypeList(recycleCameraPagination,recycleCameraPagination.getDataType()); return getTypeList(recycleCameraPagination, recycleCameraPagination.getDataType());
} }
/** 列表查询 */
/**
*
*/
@Override @Override
public List<RecycleCameraEntity> getTypeList(RecycleCameraPagination recycleCameraPagination,String dataType){ public List<RecycleCameraEntity> getTypeList(RecycleCameraPagination recycleCameraPagination, String dataType) {
String userId=userProvider.get().getUserId(); String userId = userProvider.get().getUserId();
List<String> AllIdList =new ArrayList(); List<String> AllIdList = new ArrayList();
List<List<String>> intersectionList =new ArrayList<>(); List<List<String>> intersectionList = new ArrayList<>();
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
String columnData = !isPc ? RecycleCameraConstant.getAppColumnData() : RecycleCameraConstant.getColumnData(); String columnData = !isPc ? RecycleCameraConstant.getAppColumnData() : RecycleCameraConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class); ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList()); String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total=0; int total = 0;
int recycleCameraNum =0; int recycleCameraNum = 0;
QueryWrapper<RecycleCameraEntity> recycleCameraQueryWrapper=new QueryWrapper<>(); QueryWrapper<RecycleCameraEntity> recycleCameraQueryWrapper = new QueryWrapper<>();
List<String> allSuperIDlist = new ArrayList<>(); List<String> allSuperIDlist = new ArrayList<>();
String superOp =""; String superOp = "";
if (ObjectUtil.isNotEmpty(recycleCameraPagination.getSuperQueryJson())){ if (ObjectUtil.isNotEmpty(recycleCameraPagination.getSuperQueryJson())) {
List<String> allSuperList = new ArrayList<>(); List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>(); List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = recycleCameraPagination.getSuperQueryJson(); String queryJson = recycleCameraPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class); SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0; int superNum = 0;
QueryWrapper<RecycleCameraEntity> recycleCameraSuperWrapper = new QueryWrapper<>(); QueryWrapper<RecycleCameraEntity> recycleCameraSuperWrapper = new QueryWrapper<>();
recycleCameraSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(recycleCameraSuperWrapper,RecycleCameraEntity.class,queryJson,"0")); recycleCameraSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(recycleCameraSuperWrapper, RecycleCameraEntity.class, queryJson, "0"));
int recycleCameraNum1 = recycleCameraSuperWrapper.getExpression().getNormal().size(); int recycleCameraNum1 = recycleCameraSuperWrapper.getExpression().getNormal().size();
if (recycleCameraNum1>0){ if (recycleCameraNum1 > 0) {
List<String> recycleCameraList =this.list(recycleCameraSuperWrapper).stream().map(RecycleCameraEntity::getId).collect(Collectors.toList()); List<String> recycleCameraList = this.list(recycleCameraSuperWrapper).stream().map(RecycleCameraEntity::getId).collect(Collectors.toList());
allSuperList.addAll(recycleCameraList); allSuperList.addAll(recycleCameraList);
intersectionSuperList.add(recycleCameraList); intersectionSuperList.add(recycleCameraList);
superNum++; superNum++;
} }
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : ""; superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
//and or //and or
if(superOp.equalsIgnoreCase("and")){ if (superOp.equalsIgnoreCase("and")) {
allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList); allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
}else{ } else {
allSuperIDlist = allSuperList; allSuperIDlist = allSuperList;
} }
} }
List<String> allRuleIDlist = new ArrayList<>(); List<String> allRuleIDlist = new ArrayList<>();
String ruleOp =""; String ruleOp = "";
if (ObjectUtil.isNotEmpty(ruleJson)){ if (ObjectUtil.isNotEmpty(ruleJson)) {
List<String> allRuleList = new ArrayList<>(); List<String> allRuleList = new ArrayList<>();
List<List<String>> intersectionRuleList = new ArrayList<>(); List<List<String>> intersectionRuleList = new ArrayList<>();
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class); SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
int ruleNum = 0; int ruleNum = 0;
QueryWrapper<RecycleCameraEntity> recycleCameraSuperWrapper = new QueryWrapper<>(); QueryWrapper<RecycleCameraEntity> recycleCameraSuperWrapper = new QueryWrapper<>();
recycleCameraSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(recycleCameraSuperWrapper,RecycleCameraEntity.class,ruleJson,"0")); recycleCameraSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(recycleCameraSuperWrapper, RecycleCameraEntity.class, ruleJson, "0"));
int recycleCameraNum1 = recycleCameraSuperWrapper.getExpression().getNormal().size(); int recycleCameraNum1 = recycleCameraSuperWrapper.getExpression().getNormal().size();
if (recycleCameraNum1>0){ if (recycleCameraNum1 > 0) {
List<String> recycleCameraList =this.list(recycleCameraSuperWrapper).stream().map(RecycleCameraEntity::getId).collect(Collectors.toList()); List<String> recycleCameraList = this.list(recycleCameraSuperWrapper).stream().map(RecycleCameraEntity::getId).collect(Collectors.toList());
allRuleList.addAll(recycleCameraList); allRuleList.addAll(recycleCameraList);
intersectionRuleList.add(recycleCameraList); intersectionRuleList.add(recycleCameraList);
ruleNum++; ruleNum++;
} }
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : ""; ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
//and or //and or
if(ruleOp.equalsIgnoreCase("and")){ if (ruleOp.equalsIgnoreCase("and")) {
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList); allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
}else{ } else {
allRuleIDlist = allRuleList; allRuleIDlist = allRuleList;
} }
} }
boolean pcPermission = true; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = false;
if(isPc && pcPermission){ if (isPc && pcPermission) {
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()) {
Object recycleCameraObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleCameraQueryWrapper,RecycleCameraEntity.class,recycleCameraPagination.getMenuId(),"0")); Object recycleCameraObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleCameraQueryWrapper, RecycleCameraEntity.class, recycleCameraPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(recycleCameraObj)){ if (ObjectUtil.isEmpty(recycleCameraObj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
recycleCameraQueryWrapper = (QueryWrapper<RecycleCameraEntity>)recycleCameraObj; recycleCameraQueryWrapper = (QueryWrapper<RecycleCameraEntity>) recycleCameraObj;
if( recycleCameraQueryWrapper.getExpression().getNormal().size()>0){ if (recycleCameraQueryWrapper.getExpression().getNormal().size() > 0) {
recycleCameraNum++; recycleCameraNum++;
} }
} }
} }
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object recycleCameraObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleCameraQueryWrapper,RecycleCameraEntity.class,recycleCameraPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(recycleCameraObj)){
return new ArrayList<>();
} else {
recycleCameraQueryWrapper = (QueryWrapper<RecycleCameraEntity>)recycleCameraObj;
if( recycleCameraQueryWrapper.getExpression().getNormal().size()>0){
recycleCameraNum++;
}
} }
if (!isPc && appPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object recycleCameraObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleCameraQueryWrapper, RecycleCameraEntity.class, recycleCameraPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(recycleCameraObj)) {
return new ArrayList<>();
} else {
recycleCameraQueryWrapper = (QueryWrapper<RecycleCameraEntity>) recycleCameraObj;
if (recycleCameraQueryWrapper.getExpression().getNormal().size() > 0) {
recycleCameraNum++;
}
}
} }
}
if(isPc){
if(ObjectUtil.isNotEmpty(recycleCameraPagination.getDeviceCode())){
recycleCameraNum++;
List<String> idList = new ArrayList<>();
try {
String[][] deviceCode = JsonUtil.getJsonToBean(recycleCameraPagination.getDeviceCode(),String[][].class);
for(int i=0;i<deviceCode.length;i++){
if(deviceCode[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(deviceCode[i])));
}
}
}catch (Exception e1){
try {
List<String> deviceCode = JsonUtil.getJsonToList(recycleCameraPagination.getDeviceCode(),String.class);
if(deviceCode.size()>0){
idList.addAll(deviceCode);
}
}catch (Exception e2){
idList.add(String.valueOf(recycleCameraPagination.getDeviceCode()));
}
} }
recycleCameraQueryWrapper.lambda().and(t->{ if (isPc) {
idList.forEach(tt->{ if (ObjectUtil.isNotEmpty(recycleCameraPagination.getDeviceCode())) {
t.like(RecycleCameraEntity::getDeviceCode, tt).or(); recycleCameraNum++;
});
}); List<String> idList = new ArrayList<>();
try {
String[][] deviceCode = JsonUtil.getJsonToBean(recycleCameraPagination.getDeviceCode(), String[][].class);
for (int i = 0; i < deviceCode.length; i++) {
if (deviceCode[i].length > 0) {
idList.add(JsonUtil.getObjectToString(Arrays.asList(deviceCode[i])));
}
}
} catch (Exception e1) {
try {
List<String> deviceCode = JsonUtil.getJsonToList(recycleCameraPagination.getDeviceCode(), String.class);
if (deviceCode.size() > 0) {
idList.addAll(deviceCode);
}
} catch (Exception e2) {
idList.add(String.valueOf(recycleCameraPagination.getDeviceCode()));
}
}
recycleCameraQueryWrapper.lambda().and(t -> {
idList.forEach(tt -> {
t.like(RecycleCameraEntity::getDeviceCode, tt).or();
});
});
} }
if(ObjectUtil.isNotEmpty(recycleCameraPagination.getCameraCode())){ if (ObjectUtil.isNotEmpty(recycleCameraPagination.getCameraCode())) {
recycleCameraNum++; recycleCameraNum++;
String value = recycleCameraPagination.getCameraCode() instanceof List ? String value = recycleCameraPagination.getCameraCode() instanceof List ?
JsonUtil.getObjectToString(recycleCameraPagination.getCameraCode()) : JsonUtil.getObjectToString(recycleCameraPagination.getCameraCode()) :
String.valueOf(recycleCameraPagination.getCameraCode()); String.valueOf(recycleCameraPagination.getCameraCode());
recycleCameraQueryWrapper.lambda().like(RecycleCameraEntity::getCameraCode,value); recycleCameraQueryWrapper.lambda().like(RecycleCameraEntity::getCameraCode, value);
} }
if(ObjectUtil.isNotEmpty(recycleCameraPagination.getCameraName())){ if (ObjectUtil.isNotEmpty(recycleCameraPagination.getCameraName())) {
recycleCameraNum++; recycleCameraNum++;
String value = recycleCameraPagination.getCameraName() instanceof List ? String value = recycleCameraPagination.getCameraName() instanceof List ?
JsonUtil.getObjectToString(recycleCameraPagination.getCameraName()) : JsonUtil.getObjectToString(recycleCameraPagination.getCameraName()) :
String.valueOf(recycleCameraPagination.getCameraName()); String.valueOf(recycleCameraPagination.getCameraName());
recycleCameraQueryWrapper.lambda().like(RecycleCameraEntity::getCameraName,value); recycleCameraQueryWrapper.lambda().like(RecycleCameraEntity::getCameraName, value);
} }
} }
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList); List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total>0){ if (total > 0) {
if (intersection.size()==0){ if (intersection.size() == 0) {
intersection.add("jnpfNullList"); intersection.add("jnpfNullList");
} }
recycleCameraQueryWrapper.lambda().in(RecycleCameraEntity::getId, intersection); recycleCameraQueryWrapper.lambda().in(RecycleCameraEntity::getId, intersection);
} }
//是否有高级查询 //是否有高级查询
if (StringUtil.isNotEmpty(superOp)){ if (StringUtil.isNotEmpty(superOp)) {
if (allSuperIDlist.size()==0){ if (allSuperIDlist.size() == 0) {
allSuperIDlist.add("jnpfNullList"); allSuperIDlist.add("jnpfNullList");
} }
List<String> finalAllSuperIDlist = allSuperIDlist; List<String> finalAllSuperIDlist = allSuperIDlist;
recycleCameraQueryWrapper.lambda().and(t->t.in(RecycleCameraEntity::getId, finalAllSuperIDlist)); recycleCameraQueryWrapper.lambda().and(t -> t.in(RecycleCameraEntity::getId, finalAllSuperIDlist));
} }
//是否有数据过滤查询 //是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)){ if (StringUtil.isNotEmpty(ruleOp)) {
if (allRuleIDlist.size()==0){ if (allRuleIDlist.size() == 0) {
allRuleIDlist.add("jnpfNullList"); allRuleIDlist.add("jnpfNullList");
} }
List<String> finalAllRuleIDlist = allRuleIDlist; List<String> finalAllRuleIDlist = allRuleIDlist;
recycleCameraQueryWrapper.lambda().and(t->t.in(RecycleCameraEntity::getId, finalAllRuleIDlist)); recycleCameraQueryWrapper.lambda().and(t -> t.in(RecycleCameraEntity::getId, finalAllRuleIDlist));
} }
//排序 //排序
if(StringUtil.isEmpty(recycleCameraPagination.getSidx())){ if (StringUtil.isEmpty(recycleCameraPagination.getSidx())) {
recycleCameraQueryWrapper.lambda().orderByDesc(RecycleCameraEntity::getId); recycleCameraQueryWrapper.lambda().orderByDesc(RecycleCameraEntity::getId);
}else{ } else {
try { try {
String sidx = recycleCameraPagination.getSidx(); String sidx = recycleCameraPagination.getSidx();
String[] strs= sidx.split("_name"); String[] strs = sidx.split("_name");
RecycleCameraEntity recycleCameraEntity = new RecycleCameraEntity(); RecycleCameraEntity recycleCameraEntity = new RecycleCameraEntity();
Field declaredField = recycleCameraEntity.getClass().getDeclaredField(strs[0]); Field declaredField = recycleCameraEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true); declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value(); String value = declaredField.getAnnotation(TableField.class).value();
recycleCameraQueryWrapper="asc".equals(recycleCameraPagination.getSort().toLowerCase())?recycleCameraQueryWrapper.orderByAsc(value):recycleCameraQueryWrapper.orderByDesc(value); recycleCameraQueryWrapper = "asc".equals(recycleCameraPagination.getSort().toLowerCase()) ? recycleCameraQueryWrapper.orderByAsc(value) : recycleCameraQueryWrapper.orderByDesc(value);
} catch (NoSuchFieldException e) { } catch (NoSuchFieldException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
if("0".equals(dataType)){ if ("0".equals(dataType)) {
if((total>0 && AllIdList.size()>0) || total==0){ if ((total > 0 && AllIdList.size() > 0) || total == 0) {
Page<RecycleCameraEntity> page=new Page<>(recycleCameraPagination.getCurrentPage(), recycleCameraPagination.getPageSize()); Page<RecycleCameraEntity> page = new Page<>(recycleCameraPagination.getCurrentPage(), recycleCameraPagination.getPageSize());
IPage<RecycleCameraEntity> userIPage=this.page(page, recycleCameraQueryWrapper); IPage<RecycleCameraEntity> userIPage = this.page(page, recycleCameraQueryWrapper);
return recycleCameraPagination.setData(userIPage.getRecords(),userIPage.getTotal()); return recycleCameraPagination.setData(userIPage.getRecords(), userIPage.getTotal());
}else{ } else {
List<RecycleCameraEntity> list = new ArrayList(); List<RecycleCameraEntity> list = new ArrayList();
return recycleCameraPagination.setData(list, list.size()); return recycleCameraPagination.setData(list, list.size());
} }
}else{ } else {
return this.list(recycleCameraQueryWrapper); return this.list(recycleCameraQueryWrapper);
} }
} }
@Override @Override
public RecycleCameraEntity getInfo(String id){ public RecycleCameraEntity getInfo(String id) {
QueryWrapper<RecycleCameraEntity> queryWrapper=new QueryWrapper<>(); QueryWrapper<RecycleCameraEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(RecycleCameraEntity::getId,id); queryWrapper.lambda().eq(RecycleCameraEntity::getId, id);
return this.getOne(queryWrapper); return this.getOne(queryWrapper);
} }
@Override @Override
public void create(RecycleCameraEntity entity){ public void create(RecycleCameraEntity entity) {
this.save(entity); this.save(entity);
} }
@Override @Override
public boolean update(String id, RecycleCameraEntity entity){ public boolean update(String id, RecycleCameraEntity entity) {
return this.updateById(entity); return this.updateById(entity);
} }
@Override @Override
public void delete(RecycleCameraEntity entity){ public void delete(RecycleCameraEntity entity) {
if(entity!=null){ if (entity != null) {
this.removeById(entity.getId()); this.removeById(entity.getId());
} }
} }
/** 验证表单唯一字段,正则,非空 i-0新增-1修改*/
/**
* i-0-1
*/
@Override @Override
public String checkForm(RecycleCameraForm form,int i) { public String checkForm(RecycleCameraForm form, int i) {
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0"); boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id=""; String id = "";
String countRecover = ""; String countRecover = "";
if (isUp){ if (isUp) {
id = form.getId(); id = form.getId();
} }
//主表字段验证 //主表字段验证
return countRecover; return countRecover;
} }
/** /**
* () * ()
* @param id *
* @param recycleCameraForm * @param id
* @return * @param recycleCameraForm
*/ * @return
*/
@Override @Override
@Transactional @Transactional
public void saveOrUpdate(RecycleCameraForm recycleCameraForm,String id, boolean isSave) throws Exception{ public void saveOrUpdate(RecycleCameraForm recycleCameraForm, String id, boolean isSave) throws Exception {
UserInfo userInfo=userProvider.get(); UserInfo userInfo = userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId()); UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
recycleCameraForm = JsonUtil.getJsonToBean( recycleCameraForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(RecycleCameraConstant.getFormData(),recycleCameraForm),RecycleCameraForm.class); generaterSwapUtil.swapDatetime(RecycleCameraConstant.getFormData(), recycleCameraForm), RecycleCameraForm.class);
RecycleCameraEntity entity = JsonUtil.getJsonToBean(recycleCameraForm, RecycleCameraEntity.class); RecycleCameraEntity entity = JsonUtil.getJsonToBean(recycleCameraForm, RecycleCameraEntity.class);
if(isSave){ if (isSave) {
String mainId = RandomUtil.uuId() ; String mainId = RandomUtil.uuId();
entity.setCameraCode(generaterSwapUtil.getBillNumber("cameraCodeCC", false)); entity.setCameraCode(generaterSwapUtil.getBillNumber("cameraCodeCC", false));
entity.setId(mainId); entity.setId(mainId);
}else{ } else {
entity.setCameraCode(generaterSwapUtil.getBillNumber("cameraCodeCC", false)); entity.setCameraCode(generaterSwapUtil.getBillNumber("cameraCodeCC", false));
} }
this.saveOrUpdate(entity); this.saveOrUpdate(entity);
} }
@Override
public List<RecycleCameraEntity> getByDeviceCode(String deviceCode) {
QueryWrapper<RecycleCameraEntity> query = new QueryWrapper<>();
query.lambda().eq(RecycleCameraEntity::getDeviceCode, deviceCode);
return this.list(query);
}
} }

@ -1,38 +1,42 @@
package jnpf.service.impl; package jnpf.service.impl;
import jnpf.entity.*;
import jnpf.mapper.RecycleDeviceMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.recycledevice.*;
import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.util.GeneraterSwapUtil;
import jnpf.database.model.superQuery.SuperQueryJsonModel;
import jnpf.database.model.superQuery.ConditionJsonModel;
import jnpf.database.model.superQuery.SuperQueryConditionModel;
import java.lang.reflect.Field;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.regex.Pattern;
import com.baomidou.mybatisplus.core.metadata.IPage; import jnpf.model.QueryModel;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.base.UserInfo;
import jnpf.base.model.ColumnDataModel; import jnpf.base.model.ColumnDataModel;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel; import jnpf.database.model.superQuery.SuperJsonModel;
import jnpf.entity.RecycleDeviceEntity;
import jnpf.mapper.RecycleDeviceMapper;
import jnpf.model.QueryModel;
import jnpf.model.recycledevice.RecycleDeviceConstant;
import jnpf.model.recycledevice.RecycleDeviceForm;
import jnpf.model.recycledevice.RecycleDevicePagination;
import jnpf.permission.entity.UserEntity;
import jnpf.service.RecycleDeviceService;
import jnpf.util.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.lang.reflect.Field; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.util.ArrayList; import java.text.SimpleDateFormat;
import java.util.List; import jnpf.util.*;
import java.util.stream.Collectors; import java.util.*;
import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity;
/** /**
* *
* *
* V3.5 * V3.5
* https://www.jnpfsoft.com * https://www.jnpfsoft.com
* JNPF * JNPF
* 2024-06-21 * 2024-06-22
*/ */
@Service @Service
public class RecycleDeviceServiceImpl extends ServiceImpl<RecycleDeviceMapper, RecycleDeviceEntity> implements RecycleDeviceService{ public class RecycleDeviceServiceImpl extends ServiceImpl<RecycleDeviceMapper, RecycleDeviceEntity> implements RecycleDeviceService{
@ -140,6 +144,64 @@ public class RecycleDeviceServiceImpl extends ServiceImpl<RecycleDeviceMapper, R
} }
} }
if(isPc){ if(isPc){
if(ObjectUtil.isNotEmpty(recycleDevicePagination.getBeLongCompanyId())){
recycleDeviceNum++;
List<String> idList = new ArrayList<>();
try {
String[][] beLongCompanyId = JsonUtil.getJsonToBean(recycleDevicePagination.getBeLongCompanyId(),String[][].class);
for(int i=0;i<beLongCompanyId.length;i++){
if(beLongCompanyId[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(beLongCompanyId[i])));
}
}
}catch (Exception e1){
try {
List<String> beLongCompanyId = JsonUtil.getJsonToList(recycleDevicePagination.getBeLongCompanyId(),String.class);
if(beLongCompanyId.size()>0){
idList.add(JsonUtil.getObjectToString(beLongCompanyId));
}
}catch (Exception e2){
idList.add(String.valueOf(recycleDevicePagination.getBeLongCompanyId()));
}
}
recycleDeviceQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(RecycleDeviceEntity::getBeLongCompanyId, tt).or();
});
});
}
if(ObjectUtil.isNotEmpty(recycleDevicePagination.getBeLongStationId())){
recycleDeviceNum++;
List<String> idList = new ArrayList<>();
try {
String[][] beLongStationId = JsonUtil.getJsonToBean(recycleDevicePagination.getBeLongStationId(),String[][].class);
for(int i=0;i<beLongStationId.length;i++){
if(beLongStationId[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(beLongStationId[i])));
}
}
}catch (Exception e1){
try {
List<String> beLongStationId = JsonUtil.getJsonToList(recycleDevicePagination.getBeLongStationId(),String.class);
if(beLongStationId.size()>0){
idList.add(JsonUtil.getObjectToString(beLongStationId));
}
}catch (Exception e2){
idList.add(String.valueOf(recycleDevicePagination.getBeLongStationId()));
}
}
recycleDeviceQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(RecycleDeviceEntity::getBeLongStationId, tt).or();
});
});
}
if(ObjectUtil.isNotEmpty(recycleDevicePagination.getDeviceCode())){ if(ObjectUtil.isNotEmpty(recycleDevicePagination.getDeviceCode())){
recycleDeviceNum++; recycleDeviceNum++;

@ -365,4 +365,12 @@ public class SimCardServiceImpl extends ServiceImpl<SimCardMapper, SimCardEntity
this.saveOrUpdate(entity); this.saveOrUpdate(entity);
} }
@Override
public SimCardEntity getByDeviceCode(String deviceCode) {
QueryWrapper<SimCardEntity> query = new QueryWrapper<>();
query.lambda().eq(SimCardEntity::getDeviceCode,deviceCode);
SimCardEntity simCard = this.getOne(query);
return simCard;
}
} }

@ -1,38 +1,34 @@
package jnpf.controller; package jnpf.controller;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import jnpf.base.ActionResult; import jnpf.base.ActionResult;
import jnpf.base.UserInfo; import jnpf.base.vo.PageListVO;
import jnpf.exception.DataException; import jnpf.base.vo.PaginationVO;
import jnpf.permission.entity.UserEntity; import jnpf.entity.RecycleBucketEntity;
import jnpf.service.*; import jnpf.entity.RecycleDeviceEntity;
import jnpf.entity.*; import jnpf.model.recycledevice.RecycleDeviceConstant;
import jnpf.util.*; import jnpf.model.recycledevice.RecycleDeviceForm;
import jnpf.model.recycledevice.*; import jnpf.model.recycledevice.RecycleDevicePagination;
import jnpf.service.RecycleBucketService;
import jnpf.service.RecycleCameraService;
import jnpf.service.RecycleDeviceService;
import jnpf.service.SimCardService;
import jnpf.util.GeneraterSwapUtil;
import jnpf.util.JsonUtil;
import jnpf.util.StringUtil;
import jnpf.util.UserProvider;
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.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.*;
import jnpf.annotation.JnpfField;
import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO;
import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil;
import jnpf.base.entity.ProvinceEntity;
import java.io.IOException; import java.io.IOException;
import java.util.stream.Collectors; import java.util.ArrayList;
import java.util.List;
import jnpf.engine.entity.FlowTaskEntity; import java.util.Map;
import jnpf.exception.WorkFlowException;
import org.springframework.transaction.annotation.Transactional;
/** /**
* *
@ -40,7 +36,7 @@ import org.springframework.transaction.annotation.Transactional;
* @ V3.5 * @ V3.5
* @ https://www.jnpfsoft.com * @ https://www.jnpfsoft.com
* @ JNPF * @ JNPF
* @ 2024-06-21 * @ 2024-06-22
*/ */
@Slf4j @Slf4j
@RestController @RestController
@ -99,21 +95,21 @@ public class RecycleDeviceController {
} }
/** /**
* *
* *
* @param recycleDeviceForm * @param recycleDeviceForm
* @return * @return
*/ */
@PostMapping() @PostMapping()
@Operation(summary = "创建") @Operation(summary = "创建")
public ActionResult create(@RequestBody @Valid RecycleDeviceForm recycleDeviceForm) { public ActionResult create(@RequestBody @Valid RecycleDeviceForm recycleDeviceForm) {
String b = recycleDeviceService.checkForm(recycleDeviceForm, 0); String b = recycleDeviceService.checkForm(recycleDeviceForm,0);
if (StringUtil.isNotEmpty(b)) { if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b); return ActionResult.fail(b );
} }
try { try{
recycleDeviceService.saveOrUpdate(recycleDeviceForm, null, true); recycleDeviceService.saveOrUpdate(recycleDeviceForm, null ,true);
} catch (Exception e) { }catch(Exception e){
return ActionResult.fail("新增数据失败"); return ActionResult.fail("新增数据失败");
} }
return ActionResult.success("创建成功"); return ActionResult.success("创建成功");
@ -128,88 +124,82 @@ public class RecycleDeviceController {
*/ */
@PutMapping("/{id}") @PutMapping("/{id}")
@Operation(summary = "更新") @Operation(summary = "更新")
public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid RecycleDeviceForm recycleDeviceForm, public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid RecycleDeviceForm recycleDeviceForm,
@RequestParam(value = "isImport", required = false) boolean isImport) { @RequestParam(value = "isImport", required = false) boolean isImport){
recycleDeviceForm.setId(id); recycleDeviceForm.setId(id);
if (!isImport) { if (!isImport) {
String b = recycleDeviceService.checkForm(recycleDeviceForm, 1); String b = recycleDeviceService.checkForm(recycleDeviceForm,1);
if (StringUtil.isNotEmpty(b)) { if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b); return ActionResult.fail(b );
} }
} }
RecycleDeviceEntity entity = recycleDeviceService.getInfo(id); RecycleDeviceEntity entity= recycleDeviceService.getInfo(id);
if (entity != null) { if(entity!=null){
try { try{
recycleDeviceService.saveOrUpdate(recycleDeviceForm, id, false); recycleDeviceService.saveOrUpdate(recycleDeviceForm,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
* @param id * @return
* @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){
RecycleDeviceEntity entity = recycleDeviceService.getInfo(id); RecycleDeviceEntity entity= recycleDeviceService.getInfo(id);
if (entity != null) { if(entity!=null){
//假删除 //假删除
entity.setDeleteMark(1); // entity.setDeleteMark(1);
recycleDeviceService.update(id, entity); recycleDeviceService.update(id,entity);
} }
return ActionResult.success("删除成功"); return ActionResult.success("删除成功");
} }
/** /**
* () * ()
* 使- * 使-
* * @param id
* @param id * @return
* @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){
RecycleDeviceEntity entity = recycleDeviceService.getInfo(id); RecycleDeviceEntity entity= recycleDeviceService.getInfo(id);
if (entity == null) { if(entity==null){
return ActionResult.fail("表单数据不存在!"); return ActionResult.fail("表单数据不存在!");
} }
Map<String, Object> recycleDeviceMap = JsonUtil.entityToMap(entity); Map<String, Object> recycleDeviceMap=JsonUtil.entityToMap(entity);
recycleDeviceMap.put("id", recycleDeviceMap.get("id")); recycleDeviceMap.put("id", recycleDeviceMap.get("id"));
//副表数据 //副表数据
//子表数据 //子表数据
recycleDeviceMap = generaterSwapUtil.swapDataDetail(recycleDeviceMap, RecycleDeviceConstant.getFormData(), "563701730794023749", false); recycleDeviceMap = generaterSwapUtil.swapDataDetail(recycleDeviceMap,RecycleDeviceConstant.getFormData(),"563701730794023749",false);
return ActionResult.success(recycleDeviceMap); return ActionResult.success(recycleDeviceMap);
} }
/** /**
* () * ()
* 使- * 使-
* * @param id
* @param id * @return
* @return */
*/
@Operation(summary = "信息") @Operation(summary = "信息")
@GetMapping("/{id}") @GetMapping("/{id}")
public ActionResult info(@PathVariable("id") String id) { public ActionResult info(@PathVariable("id") String id){
RecycleDeviceEntity entity = recycleDeviceService.getInfo(id); RecycleDeviceEntity entity= recycleDeviceService.getInfo(id);
if (entity == null) { if(entity==null){
return ActionResult.fail("表单数据不存在!"); return ActionResult.fail("表单数据不存在!");
} }
Map<String, Object> recycleDeviceMap = JsonUtil.entityToMap(entity); Map<String, Object> recycleDeviceMap=JsonUtil.entityToMap(entity);
recycleDeviceMap.put("id", recycleDeviceMap.get("id")); recycleDeviceMap.put("id", recycleDeviceMap.get("id"));
//副表数据 //副表数据
//子表数据 //子表数据
recycleDeviceMap = generaterSwapUtil.swapDataForm(recycleDeviceMap, RecycleDeviceConstant.getFormData(), RecycleDeviceConstant.TABLEFIELDKEY, RecycleDeviceConstant.TABLERENAMES); recycleDeviceMap = generaterSwapUtil.swapDataForm(recycleDeviceMap,RecycleDeviceConstant.getFormData(),RecycleDeviceConstant.TABLEFIELDKEY,RecycleDeviceConstant.TABLERENAMES);
return ActionResult.success(recycleDeviceMap); return ActionResult.success(recycleDeviceMap);
} }

@ -9,7 +9,7 @@ import java.util.Date;
* @ V3.5 * @ V3.5
* @ https://www.jnpfsoft.com * @ https://www.jnpfsoft.com
* @ JNPF * @ JNPF
* @ 2024-06-21 * @ 2024-06-22
*/ */
@Data @Data
@TableName("nx_recycle_device") @TableName("nx_recycle_device")

@ -6,11 +6,11 @@ import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
/** /**
* *
* @ V3.5 * @ V3.5
* @ https://www.jnpfsoft.com * @ https://www.jnpfsoft.com
* @ JNPF * @ JNPF
* @ 2024-06-21 * @ 2024-06-22
*/ */
@Data @Data
public class RecycleDeviceForm { public class RecycleDeviceForm {

@ -11,7 +11,7 @@ import java.util.List;
* @ V3.5 * @ V3.5
* @ https://www.jnpfsoft.com * @ https://www.jnpfsoft.com
* @ JNPF * @ JNPF
* @ 2024-06-21 * @ 2024-06-22
*/ */
@Data @Data
public class RecycleDevicePagination extends Pagination { public class RecycleDevicePagination extends Pagination {
@ -27,6 +27,12 @@ public class RecycleDevicePagination extends Pagination {
private String moduleId; private String moduleId;
/** 菜单id */ /** 菜单id */
private String menuId; private String menuId;
/** 所属商户 */
@JsonProperty("beLongCompanyId")
private Object beLongCompanyId;
/** 分配回收站 */
@JsonProperty("beLongStationId")
private Object beLongStationId;
/** 设备编码 */ /** 设备编码 */
@JsonProperty("deviceCode") @JsonProperty("deviceCode")
private Object deviceCode; private Object deviceCode;

@ -1,196 +1,195 @@
<template> <template>
<transition name="el-zoom-in-center"> <el-dialog title="详情"
<div class="JNPF-preview-main"> :close-on-click-modal="false" append-to-body
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" /> :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
<div class="JNPF-common-page-header"> width="600px">
<el-page-header @back="goBack" <el-row :gutter="15" class="">
content="详情"/> <el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
<div class="options"> <template v-if="!loading">
<el-button @click="goBack"> </el-button> <el-col :span="24">
</div> <jnpf-form-tip-item label="设备编码"
</div> prop="deviceCode">
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}"> <p>{{ dataForm.deviceCode }}</p>
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" > </jnpf-form-tip-item>
<template v-if="!loading"> </el-col>
<el-col :span="8" > <el-col :span="24">
<jnpf-form-tip-item label="设备编码" <jnpf-form-tip-item label="设备名称"
prop="deviceCode" > prop="deviceName" tip-label="设备名称">
<p>{{dataForm.deviceCode}}</p> <p>{{ dataForm.deviceName }}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="24">
<jnpf-form-tip-item label="设备名称" <jnpf-form-tip-item label="所在城市"
prop="deviceName" tip-label="设备名称" > prop="city">
<p>{{dataForm.deviceName}}</p> <p>{{ dataForm.city }}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="24">
<jnpf-form-tip-item label="所在城市" <jnpf-form-tip-item label="地址"
prop="city" > prop="address">
<p>{{dataForm.city}}</p> <p>{{ dataForm.address }}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="24">
<jnpf-form-tip-item label="地址" <jnpf-form-tip-item label="投用状态"
prop="address" > prop="useStatus">
<p>{{dataForm.address}}</p> <p>{{ dataForm.useStatus }} </p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="24">
<jnpf-form-tip-item label="投用状态" <jnpf-form-tip-item label="设备状态"
prop="useStatus" > prop="status">
<p>{{ dataForm.useStatus }} </p> <p>{{ dataForm.status }} </p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="24">
<jnpf-form-tip-item label="设备状态" <jnpf-form-tip-item label="所属商户"
prop="status" > prop="beLongCompanyId">
<p>{{ dataForm.status }} </p> <p>{{ dataForm.beLongCompanyId }}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="24">
<jnpf-form-tip-item label="所属商户" <jnpf-form-tip-item label="分配回收站"
prop="beLongCompanyId" > prop="beLongStationId" tip-label="分配回收站">
<p>{{dataForm.beLongCompanyId}}</p> <p>{{ dataForm.beLongStationId }}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="24">
<jnpf-form-tip-item label="分配回收站" <jnpf-form-tip-item label="所属清运员"
prop="beLongStationId" tip-label="分配回收站" > prop="beLongRecyclerPhone">
<p>{{dataForm.beLongStationId}}</p> <p>{{ dataForm.beLongRecyclerPhone }}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="24">
<jnpf-form-tip-item label="所属清运员" <jnpf-form-tip-item label="设备码二维码"
prop="beLongRecyclerPhone" > prop="deviceCodeQr">
<p>{{dataForm.beLongRecyclerPhone}}</p> <JnpfUploadImg v-model="dataForm.deviceCodeQr"
</jnpf-form-tip-item> disabled
</el-col> detailed :fileSize="100" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
<el-col :span="24" > </JnpfUploadImg>
<jnpf-form-tip-item label="设备码二维码" </jnpf-form-tip-item>
prop="deviceCodeQr" > </el-col>
<JnpfUploadImg v-model="dataForm.deviceCodeQr" <el-col :span="24">
disabled <jnpf-form-tip-item label="设备总重"
detailed :fileSize="100" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0" > prop="boxWeight">
</JnpfUploadImg> <p>{{ dataForm.boxWeight }}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="24">
<jnpf-form-tip-item label="设备总重" <jnpf-form-tip-item label="修改用户"
prop="boxWeight" > prop="lastModifyUserId">
<p>{{dataForm.boxWeight}}</p> <p>{{ dataForm.lastModifyUserId }}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24">
<jnpf-form-tip-item label="修改用户" <jnpf-form-tip-item label="修改时间"
prop="lastModifyUserId" > prop="lastModifyTime">
<p>{{dataForm.lastModifyUserId}}</p> <p>{{ dataForm.lastModifyTime }}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > </template>
<jnpf-form-tip-item label="修改时间" </el-form>
prop="lastModifyTime" >
<p>{{dataForm.lastModifyTime}}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row> </el-row>
</div> <span slot="footer" class="dialog-footer">
</transition> <el-button @click="visible = false"> </el-button>
</span>
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false"/>
</el-dialog>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev' import {getConfigData} from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf' import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail' import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index" import {thousandsFormat} from "@/components/Generator/utils/index"
export default {
components: { Detail},
props: [],
data() {
return {
visible: false,
detailVisible: false,
loading: false,
dataForm: { export default {
id :'', components: {Detail},
deviceCode : '', props: [],
deviceName : '', data() {
city : [], return {
address : '', visible: false,
useStatus : "0", detailVisible: false,
status : "0", loading: false,
beLongCompanyId : [],
beLongStationId : [],
beLongRecyclerPhone : "",
deviceCodeQr : [],
ipAddress : '',
boxWeight : '',
latitude : '',
longitude : '',
creatorTime : "",
creatorUserId : "",
lastModifyUserId : "",
lastModifyTime : "",
organizeJsonId : "",
},
useStatusOptions:[{"fullName":"启用","id":"1"},{"fullName":"暂停服务","id":"2"},{"fullName":"关闭","id":"0"}],
useStatusProps:{"label":"fullName","value":"id" },
statusOptions:[{"fullName":"离线","id":"0"},{"fullName":"在线","id":"1"}],
statusProps:{"label":"fullName","value":"id" },
beLongStationIdProps:{"label":"station_name","value":"id" ,"children":"children" },
beLongRecyclerPhoneProps:{"label":"staffs_name","value":"mobile_phone" },
} dataForm: {
}, id: '',
computed: {}, deviceCode: '',
watch: {}, deviceName: '',
created() { city: [],
address: '',
useStatus: "0",
status: "0",
beLongCompanyId: [],
beLongStationId: [],
beLongRecyclerPhone: "",
deviceCodeQr: [],
ipAddress: '',
boxWeight: '',
latitude: '',
longitude: '',
creatorTime: "",
creatorUserId: "",
lastModifyUserId: "",
lastModifyTime: "",
organizeJsonId: "",
},
useStatusOptions: [{"fullName": "启用", "id": "1"}, {"fullName": "暂停服务", "id": "2"}, {
"fullName": "关闭",
"id": "0"
}],
useStatusProps: {"label": "fullName", "value": "id"},
statusOptions: [{"fullName": "离线", "id": "0"}, {"fullName": "在线", "id": "1"}],
statusProps: {"label": "fullName", "value": "id"},
beLongStationIdProps: {"label": "station_name", "value": "id", "children": "children"},
beLongRecyclerPhoneProps: {"label": "staffs_name", "value": "mobile_phone"},
}, }
mounted() {}, },
methods: { computed: {},
toDetail(defaultValue, modelId) { watch: {},
if (!defaultValue) return created() {
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue)
})
})
},
dataInfo(dataAll){
let _dataAll =dataAll
this.dataForm = _dataAll
},
goBack() { },
this.$emit('refresh') mounted() {
}, },
init(id) { methods: {
this.dataForm.id = id || 0; toDetail(defaultValue, modelId) {
this.visible = true; if (!defaultValue) return
this.$nextTick(() => { getConfigData(modelId).then(res => {
if(this.dataForm.id){ if (!res.data || !res.data.formData) return
this.loading = true let formData = JSON.parse(res.data.formData)
request({ formData.popupType = 'general'
url: '/api/scm/RecycleDevice/detail/'+this.dataForm.id, this.detailVisible = true
method: 'get' this.$nextTick(() => {
}).then(res => { this.$refs.Detail.init(formData, modelId, defaultValue)
this.dataInfo(res.data) })
this.loading = false })
}) },
} dataInfo(dataAll) {
let _dataAll = dataAll
this.dataForm = _dataAll
},
}) init(id) {
}, this.dataForm.id = id || 0;
}, this.visible = true;
} this.$nextTick(() => {
if (this.dataForm.id) {
this.loading = true
request({
url: '/api/scm/RecycleDevice/detail/' + this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
}
})
},
},
}
</script> </script>

File diff suppressed because one or more lines are too long

@ -1,157 +1,143 @@
<template> <template>
<transition name="el-zoom-in-center"> <el-dialog :title="!dataForm.id ? '新建' :'编辑'"
<div class="JNPF-preview-main"> :close-on-click-modal="false" append-to-body
<div class="JNPF-common-page-header"> :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
<el-page-header @back="goBack" width="600px">
:content="!dataForm.id ? '新建':'编辑'"/> <el-row :gutter="15" class="">
<div class="options"> <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
<el-dropdown class="dropdown" placement="bottom"> label-position="right">
<el-button style="width:70px"> <template v-if="!loading">
<i class="el-icon-arrow-down el-icon--right"></i> <!-- 具体表单 -->
</el-button> <el-col :span="24">
<el-dropdown-menu slot="dropdown"> <jnpf-form-tip-item
<template v-if="dataForm.id"> label="设备编码" prop="deviceCode">
<el-dropdown-item @click.native="prev" :disabled='prevDis'> <JnpfInput v-model="dataForm.deviceCode" @change="changeData('deviceCode',-1)"
placeholder="系统自动生成" readonly :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item
label="设备名称" tipLabel="设备名称" prop="deviceName">
<JnpfInput v-model="dataForm.deviceName" @change="changeData('deviceName',-1)"
placeholder="设备名称" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item
label="所在城市" prop="city">
<JnpfAreaSelect v-model="dataForm.city" @change="changeData('city',-1)"
placeholder="请选择" selectType="all" clearable :style='{"width":"100%"}' :level="2">
</JnpfAreaSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item
label="地址" prop="address">
<JnpfInput v-model="dataForm.address" @change="changeData('address',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item
label="投用状态" prop="useStatus">
<JnpfRadio v-model="dataForm.useStatus" @change="changeData('useStatus',-1)"
optionType="button" direction="horizontal" size="small" :options="useStatusOptions"
:props="useStatusProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item
label="设备状态" prop="status">
<JnpfRadio v-model="dataForm.status" @change="changeData('status',-1)"
optionType="button" direction="horizontal" size="small" :options="statusOptions"
:props="statusProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item
label="所属商户" prop="beLongCompanyId">
<JnpfOrganizeSelect v-model="dataForm.beLongCompanyId" @change="changeData('beLongCompanyId',-1)"
placeholder="请选择" selectType="all" :ableIds="ableAll.beLongCompanyIdableIds"
clearable :style='{"width":"100%"}'>
</JnpfOrganizeSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item
label="分配回收站" tipLabel="分配回收站" prop="beLongStationId">
<JnpfCascader v-model="dataForm.beLongStationId" @change="changeData('beLongStationId',-1)"
placeholder="请选择" clearable :style='{"width":"100%"}' separator="/"
:options="beLongStationIdOptions" :props="beLongStationIdProps">
</JnpfCascader>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item
label="所属清运员" prop="beLongRecyclerPhone">
<JnpfSelect v-model="dataForm.beLongRecyclerPhone" @change="changeData('beLongRecyclerPhone',-1)"
placeholder="请选择" clearable :style='{"width":"100%"}' :options="beLongRecyclerPhoneOptions"
:props="beLongRecyclerPhoneProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item
label="设备码二维码" prop="deviceCodeQr">
<JnpfUploadImg v-model="dataForm.deviceCodeQr" @change="changeData('deviceCodeQr',-1)"
disabled :fileSize="100" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item
label="设备总重" prop="boxWeight">
<JnpfInput v-model="dataForm.boxWeight" @change="changeData('boxWeight',-1)"
placeholder="请选择" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item
label="修改用户" prop="lastModifyUserId">
<JnpfInput v-model="dataForm.lastModifyUserId" @change="changeData('lastModifyUserId',-1)"
placeholder="系统自动生成" readonly :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item
label="修改时间" prop="lastModifyTime">
<JnpfInput v-model="dataForm.lastModifyTime" @change="changeData('lastModifyTime',-1)"
placeholder="系统自动生成" readonly :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<!-- 表单结束 -->
</template>
</el-form>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
</el-row>
<span slot="footer" class="dialog-footer">
<div class="upAndDown-button" v-if="dataForm.id">
<el-button @click="prev" :disabled='prevDis'>
{{ '上一条' }} {{ '上一条' }}
</el-dropdown-item> </el-button>
<el-dropdown-item @click.native="next" :disabled='nextDis'> <el-button @click="next" :disabled='nextDis'>
{{ '下一条' }} {{ '下一条' }}
</el-dropdown-item> </el-button>
</template> </div>
<el-dropdown-item type="primary" @click.native="dataFormSubmit(2)" <el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
:loading="continueBtnLoading" :disabled='btnLoading'> {{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-button>
{{ !dataForm.id ? '确定并新增' : '确定并继续' }} <el-button @click="visible = false"> </el-button>
</el-dropdown-item> <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button>
</el-dropdown-menu> </span>
</el-dropdown> </el-dialog>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled='continueBtnLoading'>
</el-button>
<el-button @click="goBack"> </el-button>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
label-position="right">
<template v-if="!loading">
<!-- 具体表单 -->
<el-col :span="8">
<jnpf-form-tip-item
label="设备编码" prop="deviceCode">
<JnpfInput v-model="dataForm.deviceCode" @change="changeData('deviceCode',-1)"
placeholder="系统自动生成" readonly :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item
label="设备名称" tipLabel="设备名称" prop="deviceName">
<JnpfInput v-model="dataForm.deviceName" @change="changeData('deviceName',-1)"
placeholder="设备名称" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item
label="所在城市" prop="city">
<JnpfAreaSelect v-model="dataForm.city" @change="changeData('city',-1)"
placeholder="请选择" selectType="all" clearable :style='{"width":"100%"}' :level="2">
</JnpfAreaSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item
label="地址" prop="address">
<JnpfInput v-model="dataForm.address" @change="changeData('address',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item
label="投用状态" prop="useStatus">
<JnpfRadio v-model="dataForm.useStatus" @change="changeData('useStatus',-1)"
optionType="button" direction="horizontal" size="small" :options="useStatusOptions"
:props="useStatusProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item
label="设备状态" prop="status">
<JnpfRadio v-model="dataForm.status" @change="changeData('status',-1)"
optionType="button" direction="horizontal" size="small" :options="statusOptions"
:props="statusProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item
label="所属商户" prop="beLongCompanyId">
<JnpfOrganizeSelect v-model="dataForm.beLongCompanyId" @change="changeData('beLongCompanyId',-1)"
placeholder="请选择" selectType="all" :ableIds="ableAll.beLongCompanyIdableIds"
clearable :style='{"width":"100%"}'>
</JnpfOrganizeSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item
label="分配回收站" tipLabel="分配回收站" prop="beLongStationId">
<JnpfCascader v-model="dataForm.beLongStationId" @change="changeData('beLongStationId',-1)"
placeholder="请选择" show-all-levels clearable :style='{"width":"100%"}' separator="/"
:options="beLongStationIdOptions" :props="beLongStationIdProps">
</JnpfCascader>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item
label="所属清运员" prop="beLongRecyclerPhone">
<JnpfSelect v-model="dataForm.beLongRecyclerPhone" @change="changeData('beLongRecyclerPhone',-1)"
placeholder="请选择" clearable :style='{"width":"100%"}'
:options="beLongRecyclerPhoneOptions" :props="beLongRecyclerPhoneProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item
label="设备码二维码" prop="deviceCodeQr">
<JnpfUploadImg v-model="dataForm.deviceCodeQr" @change="changeData('deviceCodeQr',-1)"
:fileSize="100" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item
label="设备总重" prop="boxWeight">
<JnpfInput v-model="dataForm.boxWeight" @change="changeData('boxWeight',-1)"
placeholder="请选择" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item
label="修改用户" prop="lastModifyUserId">
<JnpfInput v-model="dataForm.lastModifyUserId" @change="changeData('lastModifyUserId',-1)"
placeholder="系统自动生成" readonly :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item
label="修改时间" prop="lastModifyTime">
<JnpfInput v-model="dataForm.lastModifyTime" @change="changeData('lastModifyTime',-1)"
placeholder="系统自动生成" readonly :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<!-- 表单结束 -->
</template>
</el-form>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
</el-row>
</div>
</transition>
</template> </template>
@ -438,9 +424,6 @@ export default {
this.changeDataFormData(1, 'beLongRecyclerPhone', 'beLongRecyclerPhone', index, '') this.changeDataFormData(1, 'beLongRecyclerPhone', 'beLongRecyclerPhone', index, '')
}) })
}, },
goBack() {
this.$emit('refresh')
},
clearData() { clearData() {
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll)) this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
}, },

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save