1.ftp

tangzy

2021-09-22 7d0d126fc20f36662de3394a3357ef02e55f2218

1.ftp

 src/main/java/org/springblade/modules/performance/controller/PerformanceController.java

@@ -27,16 +27,19 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.performance.entity.Performance;
import org.springblade.modules.performance.service.IPerformanceService;
import org.springblade.modules.performance.vo.PerformanceVO;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.text.SimpleDateFormat;
import java.util.*;

/**
 *  保安员表现管理
 * 保安员表现管理
 *
 * @author BladeX
 * @since 2021-07-05
 */
@@ -88,7 +91,16 @@
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入performance")
    public R save(@Valid @RequestBody Performance performance) {
        return R.status(performanceService.save(performance));
        boolean save = performanceService.save(performance);
        String s1 =
            "insert into sys_performance(id,securityId,Achievements,time,score) " +
                "values(" + "'" + performance.getId() + "'" + "," +
                "'" + performance.getSecurityid() + "'" + "," +
                "'" + performance.getAchievements() + "'" + "," +
                "'" + new SimpleDateFormat("yyyy-MM-dd").format(performance.getTime()) + "'" + "," +
                "'" + performance.getScore() + "'" + ")";
        FtpUtil.sqlFileUpload(s1);
        return R.status(save);
    }

    /**
@@ -98,7 +110,15 @@
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "修改", notes = "传入performance")
    public R update(@Valid @RequestBody Performance performance) {
        return R.status(performanceService.updateById(performance));
        boolean b = performanceService.updateById(performance);
        //内网同步
        String s1 = "update sys_performance set securityId = " + "'" + performance.getSecurityid() + "'" +
            ",Achievements = " + "'" + performance.getAchievements() + "'" +
            ",time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(performance.getTime()) + "'" +
            ",score = " + "'" + performance.getScore() + "'" +
            " " + "where id = " + "'" + performance.getId() + "'";
        FtpUtil.sqlFileUpload(s1);
        return R.status(b);
    }

    /**
@@ -125,6 +145,7 @@

    /**
     * 查询本年所有月份的表现差的数量
     *
     * @return
     */
    @GetMapping("/queryYearPer")
@@ -132,12 +153,12 @@
        Calendar cal = Calendar.getInstance();
        String year = String.valueOf(cal.get(Calendar.YEAR));
        Map<String, String> map = performanceService.queryYearPer(year);
        map = (HashMap<String, String>) sortMapBykeyAsc(map) ;//key升序
        map = (HashMap<String, String>) sortMapBykeyAsc(map);//key升序
        return R.data(map);
    }

    //升序
    public  static Map<String, String> sortMapBykeyAsc(Map<String, String> oriMap) {
    public static Map<String, String> sortMapBykeyAsc(Map<String, String> oriMap) {
        Map<String, String> sortedMap = new LinkedHashMap<String, String>();
        try {
            if (oriMap != null && !oriMap.isEmpty()) {
@@ -168,8 +189,6 @@
        }
        return sortedMap;
    }




}

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -110,9 +110,9 @@
//        }
        boolean b = save(user) && submitUserDept(user);
        String s = "insert into blade_user(id,tenant_id,account,password,real_name,email,phone,sex,role_id,dept_id,cardid,nativePlace,nation," +
            "politicaloutlook,healstats,height,address,registered,rtime,securitynumber,hold,status,dispatch) " +
            "politicaloutlook,healstats,height,address,registered,securitynumber,hold,status,dispatch) " +
            "values(" + "'" + user.getId() + "'" + "," + "'" + user.getTenantId() + "'" + "," + "'" + user.getAccount() + "'" + "," +
            "'" + user.getPassword() + "'"+ "," + "'" + user.getRealName() + "'"+ "," +
            "'" + user.getPassword() + "'" + "," + "'" + user.getRealName() + "'" + "," +
            "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
            "," + "'" + user.getDeptId() + "'" +
            "," + "'" + user.getCardid() + "'" +
@@ -123,7 +123,7 @@
            + "," + "'" + user.getHeight() + "'" +
            "," + "'" + user.getAddress() + "'" +
            "," + "'" + user.getRegistered() + "'" + "," +
            "'" + user.getRtime() + "'" + "," + "'" + user.getSecuritynumber() + "'" +
            "'" + user.getSecuritynumber() + "'" +
            "," + "'" + user.getHold() + "'" +
            "," + "'" + user.getStatus() + "'" +
            "," + "'" + user.getDispatch() + "'" + ")";
@@ -170,9 +170,9 @@
    public IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user) {
        List<UserVO> userVOS = baseMapper.selectUserPages(page, user);
        userVOS.forEach(userVO -> {
            if (null!=userVO.getCardid() && userVO.getCardid()!=""){
            if (null != userVO.getCardid() && userVO.getCardid() != "") {
                userVO.setAge(AgeUtil.idCardToAge(userVO.getCardid()));
            }else {
            } else {
                userVO.setAge(null);
            }
        });
@@ -349,7 +349,7 @@
                if (userExcel.getHold().equals("是")) {
                    user.setHold("1");
                }
                if(userExcel.getHold().equals("否")) {
                if (userExcel.getHold().equals("否")) {
                    user.setHold("2");
                }
            }
@@ -359,7 +359,7 @@
            Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
            user.setRoleId(oneRole.getId().toString());
            //性别
            if (null!=userExcel.getSex()) {
            if (null != userExcel.getSex()) {
                if (userExcel.getSex().equals("男")) {
                    user.setSex(1);
                }
@@ -372,7 +372,7 @@
            //设置账号
            user.setAccount(user.getCardid());
            //获取默认密码配置
            user.setPassword(user.getCardid().substring(user.getCardid().length()-6));
            user.setPassword(user.getCardid().substring(user.getCardid().length() - 6));
//            user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
            //新增
            this.submit(user);
@@ -549,6 +549,7 @@

    /**
     * 查询当前公司未持证保安没有报名的人员
     *
     * @param deptId
     * @return
     */
@@ -559,6 +560,7 @@

    /**
     * 计算保安人员年龄
     *
     * @param userId
     * @return
     */
@@ -574,6 +576,7 @@

    /**
     * 导入保安员
     *
     * @param data
     * @param isCovered
     */
@@ -592,7 +595,7 @@
                if (userExcel.getHold().equals("是")) {
                    user.setHold("1");
                }
                if(userExcel.getHold().equals("否")) {
                if (userExcel.getHold().equals("否")) {
                    user.setHold("2");
                }
            }
@@ -602,7 +605,7 @@
            Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
            user.setRoleId(oneRole.getId().toString());

            if (null!=userExcel.getSex()) {
            if (null != userExcel.getSex()) {
                if (userExcel.getSex().equals("男")) {
                    user.setSex(1);
                }
@@ -615,7 +618,7 @@
            //设置账号
            user.setAccount(user.getCardid());
            //获取默认密码配置
            user.setPassword(user.getCardid().substring(user.getCardid().length()-6));
            user.setPassword(user.getCardid().substring(user.getCardid().length() - 6));
//            user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
            //新增
            this.submit(user);
@@ -625,6 +628,7 @@

    /**
     * 根据保安员编码查询保安信息
     *
     * @param securityNumber 保安证编码
     * @return
     */
@@ -636,6 +640,7 @@

    /**
     * 保安员信息
     *
     * @param user
     * @return
     */
@@ -645,61 +650,61 @@
    }

    /**
     *
     * @param type 1:派遣  2：保安向
     * @param type         1:派遣  2：保安向
     * @param deptid
     * @param jurisdiction
     * @return
     */
    @Override
    public List<Map<String, Object>> seleL(String type,String deptid, String jurisdiction,Long userId) {
    public List<Map<String, Object>> seleL(String type, String deptid, String jurisdiction, Long userId) {
        List<Map<String, Object>> list = new ArrayList<>();
        //派遣
        if (Integer.parseInt(type)==1){
        if (Integer.parseInt(type) == 1) {
            list = baseMapper.getDispaterInfo(deptid, jurisdiction);
        }
        //工作汇报
        //保安向保安
        if (Integer.parseInt(type)==2){
            list = baseMapper.getWorkReportInfo(type,deptid, jurisdiction);
        if (Integer.parseInt(type) == 2) {
            list = baseMapper.getWorkReportInfo(type, deptid, jurisdiction);
        }
        //保安向民警
        if (Integer.parseInt(type)==3){
        if (Integer.parseInt(type) == 3) {
            //查询用户信息
            User user = this.getById(userId);
            //判断用户是否被派遣
            if (null!=user.getDispatch()){
            if (null != user.getDispatch()) {
                if (user.getDispatch().equals("0")) {
                    //在派遣中，向派遣所在地辖区民警汇报
                    //查询派遣信息
                    DispatcherVO dispatcherVO = baseMapper.getDispatcherInfoByUserId(userId);
                    list = baseMapper.getWorkReportInfos(null, null, dispatcherVO.getJurisdiction());
                }
                if (user.getDispatch().equals("1")){
                if (user.getDispatch().equals("1")) {
                    //未派遣或已派遣结束，向单位所在辖区民警汇报
                    Information information = new Information();
                    information.setDepartmentid(user.getDeptId());
                    Information one = iInformationService.getOne(Condition.getQueryWrapper(information));
                    list = baseMapper.getWorkReportInfos(type,null, one.getJurisdiction());
                    list = baseMapper.getWorkReportInfos(type, null, one.getJurisdiction());
                }
            }else {
            } else {
                //未派遣或已派遣结束，向单位所在辖区民警汇报
                Information information = new Information();
                information.setDepartmentid(user.getDeptId());
                Information one = iInformationService.getOne(Condition.getQueryWrapper(information));
                list = baseMapper.getWorkReportInfos(type,null, one.getJurisdiction());
                list = baseMapper.getWorkReportInfos(type, null, one.getJurisdiction());
            }

        }
        //民警对民警
        if (Integer.parseInt(type)==4){
            list = baseMapper.getWorkReportInfo(type,deptid, jurisdiction);
        if (Integer.parseInt(type) == 4) {
            list = baseMapper.getWorkReportInfo(type, deptid, jurisdiction);
        }
        return list;
    }

    /**
     * 查询账号相同的用户数量
     *
     * @param account
     * @return
     */