Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

张天森

2022-10-15 0d8d525f649d2f82318d0c2b74adf6f3768744e3

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

 flower_city/src/main/java/com/dg/core/controller/CommonController.java

@@ -1,11 +1,14 @@
package com.dg.core.controller;

import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.dg.core.CorsConfig;
import com.dg.core.ResultData;
import com.dg.core.db.gen.AjaxResult;
import com.dg.core.file.FtpConstants;
import com.dg.core.file.MimeTypeUtils;
import com.dg.core.file.SFTPUtil;
import com.dg.core.util.TestDate;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

@@ -17,6 +20,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
@@ -34,6 +38,7 @@

  @Autowired
  private CorsConfig corsConfig;



  // FTP 登录用户名
@@ -127,13 +132,30 @@
      return ResultData.error("上传文件失败 "+e.getMessage());
    }


//    AjaxResult ajax = new AjaxResult();
//    ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER));
//    ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
//    ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));
  }


  /**
   * 通用上传请求（多个）
   */
  @ApiOperation("判断当前时间是否是工作日,格式为“2022-10-16”,不传默认为今天")
  @GetMapping("/isWeekday")
  public ResultData isWeekday(@RequestParam(value = "dateTime",required = false) String dateTime)
  {
      TestDate td=new TestDate();
      DateTime dateTimeUser;
      if (dateTime==null)
        dateTimeUser=DateTime.now();
      else{
        dateTimeUser=DateUtil.parse(dateTime);
      }
      if (td.isWeekday(dateTimeUser))
         return success("工作日");
      else
         return success("休息日或者周末");
  }



 flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java

@@ -41,6 +41,10 @@
    IOrganizationChartService iOrganizationChartService;


    @Autowired
    IAreaCodeService iAreaCodeService;


    @ApiOperation("首页统计不同状态工单数")
    @GetMapping("/getWorkOrder")
    public ResultData getWorkOrder()
@@ -317,6 +321,43 @@



    @ApiOperation("导办工单按区域统计")
    @GetMapping("/getRangeStatistics")
    public TableDataInfo getRangeStatistics()
    {
        List<AreaCode2022> code2022s=iAreaCodeService.getListByPCode("510400000000");

        List<RangeStatistics> rangeStatistics=new ArrayList<>();

        for (AreaCode2022 bean:code2022s)
        {
            RangeStatistics range=new RangeStatistics();
            range.setName(bean.getName());

            List<String> ids;

            if(bean.getCode()==510401000000L)
            {
                ids=homeStatisticsService.countId("");
            }
            else
            {
                ids=homeStatisticsService.countId(bean.getCode()+"");
            }
            int num=0;
            if(ids!=null&&ids.size()>0)
            {
                num=iGuideRepairOrderService.countStatisticsNum(null,ids,null,null,null,null);
            }
            range.setNum(num+"");
            rangeStatistics.add(range);
        }


        return getDataTable(rangeStatistics);
    }






 flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysUserRecord.java

New file
@@ -0,0 +1,56 @@
package com.dg.core.db.gen.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * <p>
 * 用户访问记录
 * </p>
 *
 * @author fengjin
 * @since 2022-10-15
 */
@TableName("automessage_sys_user_record")
@Data
@ApiModel("用户访问记录类")
public class AutomessageSysUserRecord implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id
     */
    @ApiModelProperty("主键")
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    /**
     * 用户id
     */
    @ApiModelProperty("用户id")
    private Integer userId;

    /**
     * 访问时间
     */
    @ApiModelProperty("访问时间")
    private LocalDateTime createTime;

    /**
     * 进入方式(1.扫码进入 2.花城进入 3.分享进入)
     */
    @ApiModelProperty("进入方式(1.扫码进入 2.花城进入 3.分享进入)")
    private Integer joinType;




}

 flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java

@@ -181,6 +181,19 @@
    @ApiModelProperty(name = "serviceState", value = "服务状态(1.已解决 2.未解决)")
    private  Integer serviceState;

    /**
     * 超时时间
     */
    @ApiModelProperty("超时时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime timeoutTime;

    /**
     * 是否推送过（1 是 2 否）
     */
    @ApiModelProperty("是否推送过（1 是 2 否）")
    private Integer isPush;

    @TableField(exist = false)
    @ApiModelProperty(name = "sumClassifyName", value = "完整分类名称")
    private String sumClassifyName;

 flower_city/src/main/java/com/dg/core/db/gen/entity/RangeStatistics.java

New file
@@ -0,0 +1,19 @@
package com.dg.core.db.gen.entity;


import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;

@ApiModel("导办工单根据地区统计")
@Data
public class RangeStatistics implements Serializable
{
    @ApiModelProperty("区域名")
    private String name;

    @ApiModelProperty("数量")
    private String num;
}

 flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSysUserRecordMapper.java

New file
@@ -0,0 +1,16 @@
package com.dg.core.db.gen.mapper;

import com.dg.core.db.gen.entity.AutomessageSysUserRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author fengjin
 * @since 2022-10-15
 */
public interface AutomessageSysUserRecordMapper extends BaseMapper<AutomessageSysUserRecord> {

}

 flower_city/src/main/java/com/dg/core/db/gen/mapper/HomeStatisticsMapper.java

@@ -86,4 +86,8 @@
    public List<ClassifyAdministration> getClassify(@Param("parentId") String parentId,
                                                    @Param("classifyGrade") String classifyGrade);


    List<String> countId(String district);


}

 flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java

@@ -62,11 +62,11 @@
                //如果token验证成功，权限检查通过，将token对应的用户id存在request中，便于之后注入
                request.setAttribute(Constant.CURRENT_USER_ID, manager.getHCUserId(HCtoken));
                System.out.println("花城用户id："+manager.getHCUserId(HCtoken));
                SysUser ss = IUserService.selectData(manager.getHCUserId(HCtoken)+"",null);
                if(ss==null && ss.getUserId()<0)
                {
                    HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(manager.getHCUserId(HCtoken)+"","","");
                    if(huaChengSysUser!=null && huaChengSysUser.getUserId()<0 )
                if(huaChengSysUser!=null && huaChengSysUser.getUserId()!=0 )
                {
                    SysUser sysUser = IUserService.selectData(null,huaChengSysUser.getPhone());
                    if(sysUser==null && sysUser.getUserId()<0)
                    {
                        //本地没有此用户  新用户
                        SysUser newSysUser=new SysUser();

 flower_city/src/main/java/com/dg/core/service/HomeStatisticsService.java

@@ -84,4 +84,7 @@
    public List<ClassifyAdministration> getClassify(@Param("parentId") String parentId,
                                                    @Param("classifyGrade") String classifyGrade);


    List<String> countId(String district);

}

 flower_city/src/main/java/com/dg/core/service/ISysUserRecordService.java

New file
@@ -0,0 +1,4 @@
package com.dg.core.service;

public interface ISysUserRecordService {
}

 flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java

@@ -75,5 +75,10 @@
        return baseMapper.getClassify(parentId,classifyGrade);
    }

    @Override
    public List<String> countId(String district) {
        return baseMapper.countId(district);
    }


}

 flower_city/src/main/java/com/dg/core/service/impl/SysUserRecordServiceImpl.java

New file
@@ -0,0 +1,24 @@
package com.dg.core.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dg.core.ResultData;
import com.dg.core.db.gen.entity.AutomessageSysUserRecord;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.db.gen.mapper.AutomessageSysUserRecordMapper;
import com.dg.core.db.gen.mapper.SysUserMapper;
import com.dg.core.service.ISysUserRecordService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

@Service
public class SysUserRecordServiceImpl extends ServiceImpl<AutomessageSysUserRecordMapper, AutomessageSysUserRecord> implements ISysUserRecordService {

    @Resource
    private SysUserMapper sysUserMapper;

    public ResultData add(SysUser sysUser){
        return null;
    }

}

 flower_city/src/main/java/com/dg/core/util/WxUtil.java

@@ -215,5 +215,32 @@
    }


    /**
     * 工单超时推送
     *
     * @param openId
     *            用户openid
     * @param accessToken
     *            token会话标识
     */
    public  void sendGuideRepairOrderOvertime(String openId, String accessToken, String templateId, GuideRepairOrder guideRepairOrder){
        WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
        subscribeDTO.setTouser(openId);
        subscribeDTO.setTemplate_id(templateId);
        subscribeDTO.setMiniprogram_state("formal");//测试,部署正式版本时候需要更改为formal
        List<TemplateParam> paras=new ArrayList<TemplateParam>();
        Calendar calendar = Calendar.getInstance();
        paras.add(new TemplateParam("thing4","给您分配的工单:'"+guideRepairOrder.getMatterName()+"',已超时请即使处理"));//超时提示内容
        paras.add(new TemplateParam("thing2",guideRepairOrder.getConsultUserName()));//咨询人
        paras.add(new TemplateParam("thing3",guideRepairOrder.getConsultContent()));//咨询内容
        subscribeDTO.setTemplateParamList(paras);
        try {
            sendSubscribe(accessToken,subscribeDTO);
        }catch (Exception e){
            System.out.println(e.getMessage());
        }
    }



}

 flower_city/src/main/resources/mapper/AutomessageSysUserRecordMapper.xml

New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dg.core.db.gen.mapper.AutomessageSysUserRecordMapper">

</mapper>

 flower_city/src/main/resources/mapper/HomeStatisticsMapper.xml

@@ -126,4 +126,15 @@
    </select>


    <!--  首页统计区域下的部门  -->
    <select id="countId" parameterType="string" resultType="string">
        select id from automessage_organization_chart
        <where>
            <if test="district != null ">
                AND district=#{district}
            </if>
        </where>
    </select>


</mapper>

 flower_city/src/main/resources/mapper/SysUserMapper.xml

@@ -91,6 +91,9 @@
        <include refid="selectSysUserVo"/>
        <where>
            user_type=#{userType}
            <if test="keyWord!=null and keyWord!=''">
              and (transaction_names like concat('%',#{keyWord}, '%') or  user_name like concat('%',#{keyWord}, '%'))
            </if>
        </where>
        ORDER BY department_id
    </select>