h5_standard/.env.development

@@ -10,13 +10,13 @@
# VUE_APP_API = 'https://106.14.220.133:10012/'

# 萍姐本地
# VUE_APP_API = 'http://192.168.0.12:10012/'
 VUE_APP_API = 'http://192.168.3.219:10021/'

# 任康本地
# VUE_APP_API = 'http://192.168.0.15:10021/'
# VUE_APP_API = 'http://192.168.0.127:10021/'

VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api/'
#VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api/'

# VUE_APP_API = 'http://192.168.0.13:10012/'


 h5_standard/src/views/children.vue

@@ -36,6 +36,7 @@

    const title = ref<string>('')

    alert(window.document.title)
    const pathLists = reactive<string[]>([
        '/index',
        '/workbench',

 server/README.md

@@ -1,3 +1,7 @@
基础工程：Eva v2.0
官网：http://eva.adjustrd.com/
技术支持QQ群：877957236


启动命令：
nohup java -Xms512m -Xmx512m -Xmn512m -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=256m -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+UseCMSCompactAtFullCollection -XX:CMSInitiatingOccupancyFraction=10021 -jar /mnt/sdc/jars/dmmestest/doumeeplant.jar >/mnt/sdc/jars/dmmestest/doumeeplant.log 2>/mnt/sdc/jars/dmmestest/doumeeplanterr.log &

 server/src/main/java/doumeemes/core/utils/WxMiniConfig.java

@@ -3,12 +3,7 @@
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
import com.github.binarywang.wxpay.config.WxPayConfig;
import com.github.binarywang.wxpay.constant.WxPayConstants;
import com.github.binarywang.wxpay.service.WxPayService;
import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
import doumeemes.biz.system.SystemDictDataBiz;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;


 server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java

@@ -84,7 +84,7 @@
    private String  companyName;

    @ApiModelProperty(value = "企业用户名称")
    @ExcelColumn(name="企业名称", color = IndexedColors.RED, width = 16)
    @ExcelColumn(name="企业用户名称", color = IndexedColors.RED, width = 16)
    @TableField(exist = false)
    private String  companyUserName;


 server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java

@@ -293,8 +293,8 @@
        }
        List<String> departName = new ArrayList<>();
        List<String> procedureName = new ArrayList<>();
        plansList.forEach(s->{

        int num =0;
        for(DeviceImportDTO s : plansList){
            if (StringUtils.isBlank(s.getDeviceName())
                    || s.getDeviceName().length() > 50
                    || StringUtils.isBlank(s.getDepartName())
@@ -303,14 +303,13 @@
                    || StringUtils.isBlank(s.getFinishWarehouseLocationName())){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"导入数据内容有误");
            }
            if(isRepeatCode(s.getDeviceCode(),plansList)){
            if(isRepeatCode(s,num,plansList)){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"文档中设备号【"+s.getDeviceCode()+"】重复！");
            }
            departName.add(s.getDepartName());
            procedureName.add(s.getProcedureName());
        });


            num++;
        }

        plansList.forEach(s->{

@@ -431,12 +430,14 @@
        });
    }

    private boolean isRepeatCode(String deviceCode, List<DeviceImportDTO> plansList) {
        if(StringUtils.isNotBlank(deviceCode)){
    private boolean isRepeatCode(DeviceImportDTO s,int num,List<DeviceImportDTO> plansList) {
        if(StringUtils.isNotBlank(s.getDeviceCode())){
            int tNum = 0;
            for(DeviceImportDTO d :plansList){
                if(StringUtils.equals(deviceCode, d.getDeviceCode())){
                if(num != tNum && StringUtils.equals(s.getDeviceCode(), d.getDeviceCode())){
                    return  true;
                }
                tNum++;
            }
        }
        return  false;

 server/src/main/resources/application.yml

@@ -10,7 +10,7 @@
#  application:
#    name: doumeemes
  profiles:
    active: standard
    active: standardPro
  # JSON返回配置
  jackson:
    # 默认时区