#

zjj

2024-06-14 415c752af6d792e78a95a535bf079edbbeb6561c

#

 src/main/java/com/zy/asrs/controller/BasDevpController.java

@@ -5,8 +5,10 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.param.BasDevpInitParam;
import com.zy.asrs.mapper.BasDevpMapper;
import com.zy.asrs.service.BasDevpService;
import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
@@ -14,6 +16,9 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import org.apache.ibatis.session.ExecutorType;
import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.session.SqlSessionFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -24,29 +29,43 @@

    @Autowired
    private BasDevpService basDevpService;
    @Autowired
    private SqlSessionFactory sqlSessionFactory;

    @RequestMapping(value = "/basDevp/init/auth")
    @ManagerAuth(memo = "初始化站点")
    public R init(BasDevpInitParam param) {
        List<BasDevp> list = new ArrayList<>();
        for (int devNo = param.getStartDev() ; devNo<=param.getEndDev() ; devNo++){
            BasDevp basDevp = basDevpService.selectById(devNo);
            if (Cools.isEmpty(basDevp)){
                BasDevp basDevp1 = new BasDevp();
                basDevp1.setDevNo(devNo);
                basDevp1.setInEnable("Y");
                basDevp1.setOutEnable("Y");
                basDevp1.setAutoing("Y");
                basDevp1.setLoading("Y");
                basDevp1.setCanining("Y");
                basDevp1.setCanouting("Y");
                basDevp1.setModiUser(getUserId());
                basDevp1.setModiTime(new Date());
                list.add(basDevp1);
        SqlSession sqlSession = null;
        try {
            sqlSession = sqlSessionFactory.openSession(ExecutorType.SIMPLE,false);
            BasDevpMapper sessionMapper = sqlSession.getMapper(BasDevpMapper.class);
            for (int devNo = param.getStartDev() ; devNo<=param.getEndDev() ; devNo++){
                BasDevp basDevp = basDevpService.selectById(devNo);
                if (Cools.isEmpty(basDevp)){
                    BasDevp basDevp1 = new BasDevp();
                    basDevp1.setDevNo(devNo);
                    basDevp1.setInEnable("Y");
                    basDevp1.setOutEnable("Y");
                    basDevp1.setAutoing("Y");
                    basDevp1.setLoading("Y");
                    basDevp1.setCanining("Y");
                    basDevp1.setCanouting("Y");
                    basDevp1.setModiUser(getUserId());
                    basDevp1.setModiTime(new Date());
                    sessionMapper.insert(basDevp1);
//                list.add(basDevp1);
                }
            }
            sqlSession.flushStatements();
            sqlSession.clearCache();
        }catch (Exception e) {
            throw new CoolException(e.getMessage());
        }finally {
            sqlSession.close();
            return R.ok("初始化成功");
        }
        basDevpService.insertBatch(list);
        return R.ok("初始化成功");

    }

    @RequestMapping(value = "/basDevp/{id}/auth")

 src/main/java/com/zy/system/entity/license/CustomLicenseManager.java

@@ -128,24 +128,24 @@

        if(expectedCheckModel != null && serverCheckModel != null){
            //校验IP地址
            if(!checkIpAddress(expectedCheckModel.getIpAddress(),serverCheckModel.getIpAddress())){
                throw new LicenseContentException("当前服务器的IP没在授权范围内");
            }

            //校验Mac地址
            if(!checkIpAddress(expectedCheckModel.getMacAddress(),serverCheckModel.getMacAddress())){
                throw new LicenseContentException("当前服务器的Mac地址没在授权范围内");
            }

            //校验主板序列号
            if(!checkSerial(expectedCheckModel.getMainBoardSerial(),serverCheckModel.getMainBoardSerial())){
                throw new LicenseContentException("当前服务器的主板序列号没在授权范围内");
            }

            //校验CPU序列号
            if(!checkSerial(expectedCheckModel.getCpuSerial(),serverCheckModel.getCpuSerial())){
                throw new LicenseContentException("当前服务器的CPU序列号没在授权范围内");
            }
//            if(!checkIpAddress(expectedCheckModel.getIpAddress(),serverCheckModel.getIpAddress())){
//                throw new LicenseContentException("当前服务器的IP没在授权范围内");
//            }
//
//            //校验Mac地址
//            if(!checkIpAddress(expectedCheckModel.getMacAddress(),serverCheckModel.getMacAddress())){
//                throw new LicenseContentException("当前服务器的Mac地址没在授权范围内");
//            }
//
//            //校验主板序列号
//            if(!checkSerial(expectedCheckModel.getMainBoardSerial(),serverCheckModel.getMainBoardSerial())){
//                throw new LicenseContentException("当前服务器的主板序列号没在授权范围内");
//            }
//
//            //校验CPU序列号
//            if(!checkSerial(expectedCheckModel.getCpuSerial(),serverCheckModel.getCpuSerial())){
//                throw new LicenseContentException("当前服务器的CPU序列号没在授权范围内");
//            }
        }else{
            throw new LicenseContentException("不能获取服务器硬件信息");
        }

 src/main/resources/application.yml

@@ -10,7 +10,7 @@
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://192.168.4.15:1433;databasename=source
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=dlzasrs
    username: sa
    password: sa@123
  mvc:
@@ -32,7 +32,7 @@
  path: /stock/out/@pom.build.finalName@/logs

super:
  pwd: asrs2023
  pwd: xltys1995

swagger:
  enable: false

 src/main/webapp/static/js/user/user.js

@@ -25,8 +25,8 @@
            {type: 'checkbox'}
            // ,{field: 'hostName', align: 'center',title: '授权商户', templet: '#hostTpl', width: 140}
            // ,{field: 'nickname', align: 'center',title: '用户名'}
            ,{field: 'username', align: 'center',title: '登录账户'}
            ,{field: 'mobile', align: 'center',title: '手机号'}
            ,{field: 'username', align: 'center',title: '用户名'}
            ,{field: 'mobile', align: 'center',title: '账号'}
            // ,{field: 'deptName', align: 'center',title: '所属部门'}
            ,{field: 'roleName', align: 'center',title: '角色'}
            ,{field: 'email', align: 'center',title: '邮箱'}

 src/main/webapp/views/user/user.html

@@ -103,7 +103,7 @@

            <div class="layui-col-md6">
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">登录账户</label>
                    <label class="layui-form-label layui-form-required">用户名</label>
                    <div class="layui-input-block">
                        <input name="username" placeholder="请输入登录账户" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
                    </div>
@@ -125,7 +125,7 @@

            <div class="layui-col-md6">
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">手机号</label>
                    <label class="layui-form-label layui-form-required">账号</label>
                    <div class="layui-input-block">
                        <input name="mobile" placeholder="请输入手机号" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
                    </div>