mrshi

MrShi

2024-02-29 cf549247904da2b8f5e1fe112011305c51c19857

mrshi

 admin/src/views/business/visits_hk.vue

@@ -68,17 +68,6 @@
                </el-table-column>
                <el-table-column prop="status" fixed="right" label="状态" min-width="100px">
                    <template slot-scope="{row}">
                      <el-option label="待审核" value="1"></el-option>
                      <el-option label="正常" value="2"></el-option>
                      <el-option label="迟到" value="3"></el-option>
                      <el-option label="审核退回" value="4"></el-option>
                      <el-option label="超期自动签离" value="5"></el-option>
                      <el-option label="已签离" value="6"></el-option>
                      <el-option label="超期未签离" value="7"></el-option>
                      <el-option label="已到达" value="8"></el-option>
                      <el-option label="审核失效" value="9"></el-option>
                      <el-option label="邀约中" value="10"></el-option>
                      <el-option label="邀约失效" value="11"></el-option>
                        <span v-if="row.status === 1">待审核</span>
                        <span v-if="row.status === 2">正常</span>
                        <span v-if="row.status === 3">迟到</span>

 admin/src/views/login.vue

@@ -58,7 +58,8 @@
        uuid: this.captcha.uuid
      })
        .then(() => {
          window.location.href = process.env.VUE_APP_CONTEXT_PATH
         // window.location.href = process.env.VUE_APP_CONTEXT_PATH
          window.location.reload()
        })
        .catch(e => {
          this.refreshCaptcha()

 server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java

@@ -120,4 +120,5 @@
        return ApiResponse.success(memberCardService.findList(card));
    }


}

 server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java

@@ -236,4 +236,13 @@
        return ApiResponse.success("同步成功");
    }



    @ApiOperation("测试人员冻结")
    @PostMapping("/testFreeFz")
    public ApiResponse testFreeFz() {
        memberService.memberFreeze();
        return ApiResponse.success(null);
    }

}

 server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java

@@ -64,7 +64,7 @@
     * æ¯åˆ†é’Ÿæ‹‰å–一次今日的访客预约数据
     * @throws Exception
     */
    @Scheduled(fixedDelay= 60*1000)
    @Scheduled(fixedDelay= 30*1000)
    public void syncVistAppointData() throws Exception {
        if(Constants.DEALING_FROM_HK_VISIT){
            return ;

 server/dmvisit_admin/src/main/resources/application.yml

@@ -10,7 +10,7 @@
  #  application:
  #    name: doumeemes
  profiles:
    active: dev
    active: testHS

  # JSON返回配置
  jackson:

 server/dmvisit_screen/src/main/java/com/doumee/service/impl/ScreenServiceImpl.java

@@ -38,11 +38,11 @@
    public   CountDataResponse countData(BaseRequest param){
        MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.select("count(1) as applyTotalNum");
        queryWrapper.select("(select count(1) from visits where TO_DAYS(create_date)=TO_DAYS(now()) and status not in(1,4,9)) as applyPassNum");
        queryWrapper.select("(select count(1) from visits where TO_DAYS(create_date)=TO_DAYS(now()) and status=8) as visitInNum");
        queryWrapper.select("(select count(1) from visits where TO_DAYS(create_date)=TO_DAYS(now()) and status=6) as visitOutNum");
        queryWrapper.select("(select count(1) from visits where TO_DAYS(create_date)=TO_DAYS(now()) and status not in(5,6,8)) as applyPassNum");
        queryWrapper.select("(select count(1) from visits where TO_DAYS(create_date)=TO_DAYS(now()) and status in (5)) as visitInNum");
        queryWrapper.select("(select count(1) from visits where TO_DAYS(create_date)=TO_DAYS(now()) and status in (6,8)) as visitOutNum");
        queryWrapper.select("(select count(1) from car_event where TO_DAYS(create_date)=TO_DAYS(now()) and inout_type=0 and event_type="+ HKConstants.EventTypes.PARK_PASS_IN.getKey() +") as carInNum");
        queryWrapper.select("(select count(1) from car_event where TO_DAYS(create_date)=TO_DAYS(now()) and inout_type=1 and event_type="+ HKConstants.EventTypes.PARK_PASS_OUT.getKey() +") as carOutNum");
        queryWrapper.select("(select count(1) from car_event where TO_DAYS(create_date)=TO_DAYS(now()) and (inout_type !=0 ) and event_type="+ HKConstants.EventTypes.PARK_PASS_OUT.getKey() +") as carOutNum");
        queryWrapper.eq(Visits::getIsdeleted, Constants.ZERO );
        queryWrapper.apply("TO_DAYS(create_date)=TO_DAYS(now())" );
        queryWrapper.last("limit 1");
@@ -84,7 +84,7 @@
                model.setCreateDate(event.getCreateDate());
                model.setCompanyName(event.getCompanyName());
                model.setMemberName(event.getMemberName());
                model.setType(event.getMemberType());
                model.setType(Constants.formatIntegerNum(event.getMemberType()) !=2?1:2);
                model.setVisitCompanyName(event.getVisitCompanyName());
                list.add(model);
            }
@@ -98,7 +98,6 @@
        MPJLambdaWrapper<VisitEvent> wrapper = new MPJLambdaWrapper<>();
        wrapper.selectAll(VisitEvent.class) ;
        wrapper.apply("TO_DAYS(create_date)=TO_DAYS(now())" );
        wrapper.in(CarEvent::getEventType, Arrays.asList(new Integer[]{HKConstants.EventTypes.PARK_PASS_IN.getKey(),HKConstants.EventTypes.PARK_PASS_OUT.getKey()}));
        wrapper.last("limit 50");
        wrapper.orderByDesc(VisitEvent::getCreateDate);
        List<VisitEvent> result =visitEventMapper.selectList( wrapper);

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java

@@ -1070,6 +1070,11 @@
    @Override
    public void approveApply(ApproveNoticeRequest param){
        try{
            if(!Objects.isNull(param)
                ){

            }

            if(Objects.isNull(param)
                    ||Objects.isNull(param.getId())
                    ||Objects.isNull(param.getStatus())){

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.config.DataSyncConfig;
import com.doumee.config.SpringContextUtil;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.request.event.acs.EventAcsInfoRequest;
@@ -55,6 +56,8 @@
    private DeviceEventMapper deviceEventMapper;
    @Autowired
    private MemberMapper memberMapper;
    @Autowired
    private DataSyncConfig dataSyncConfig;
    @Autowired
    private CarEventMapper carEventMapper;
    @Autowired
@@ -317,6 +320,10 @@
        if(visits !=null){
            //如果人员信息存在，则删除之前的所有进场数据（无论此次推送是进厂还是出场推送事件）
            delRetentionLis.add(visits.getMemberId());
            if(dataSyncConfig.getOrgUserDataOrigin() == DataSyncConfig.origin.hk){
                //如果是伊利大屏项目，不做处理
                return;
            }
            Visits updateVistis = new Visits();
            updateVistis.setId(visits.getId());
            if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_IN.getKey()){

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java

@@ -101,7 +101,7 @@
                curPage++;
            }
            if(allHkList .size() == 0){
                throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未同步到任何组织信息！");
                throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未同步到任何信息！");
            }
            //清空原有当天的数据
            visitsMapper.delete(new UpdateWrapper<Visits>().lambda()

 server/dmvisit_service/src/main/resources/application-dev.yml

@@ -6,7 +6,12 @@
    password: rtjgfEr@&0c0m
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource

  redis:
    #    database: 0
    host: 127.0.0.1
    port: 6379
    password:
    timeout: 5000      # è¿žæŽ¥æ± ä¸­çš„最小空闲连接
  jackson:
    time-zone: GMT+8
    date-format: yyyy-MM-dd HH:mm:ss

 server/dmvisit_service/src/main/resources/application-devYL.yml

@@ -6,7 +6,12 @@
    password: rtjgfEr@&0c0m
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource

  redis:
    #    database: 0
    host: 127.0.0.1
    port: 6379
    password:
    timeout: 5000      # è¿žæŽ¥æ± ä¸­çš„最小空闲连接
  jackson:
    time-zone: GMT+8
    date-format: yyyy-MM-dd HH:mm:ss

 server/dmvisit_service/src/main/resources/application-pro.yml

@@ -7,7 +7,12 @@
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource


  redis:
    #    database: 0
    host: 127.0.0.1
    port: 6379
    password:
    timeout: 5000      # è¿žæŽ¥æ± ä¸­çš„最小空闲连接
knife4j:
  enable: true
  basic:

 server/dmvisit_service/src/main/resources/application-test.yml

@@ -10,7 +10,12 @@
  jackson:
    time-zone: GMT+8
    date-format: yyyy-MM-dd HH:mm:ss

  redis:
    #    database: 0
    host: 127.0.0.1
    port: 6379
    password:
    timeout: 5000      # è¿žæŽ¥æ± ä¸­çš„最小空闲连接
#rocketmq:
#  namesrvAddr: rmq-cn-pe335rcnn06.cn-shanghai.rmq.aliyuncs.com:8080
#  groupId: GID-wakatest

 server/dmvisit_service/src/main/resources/application-testHS.yml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,81 @@
spring:
  # æ•°æ®æºé…ç½®
  datasource:
    url: jdbc:mysql://127.0.0.1:3306/visit?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    username: root
    password: HS!20240227
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource
  redis:
    #    database: 0
    host: 127.0.0.1
    port: 6379
    password: huasun618
    timeout: 5000      # è¿žæŽ¥æ± ä¸­çš„最小空闲连接
  jackson:
    time-zone: GMT+8
    date-format: yyyy-MM-dd HH:mm:ss

#rocketmq:
#  namesrvAddr: rmq-cn-pe335rcnn06.cn-shanghai.rmq.aliyuncs.com:8080
#  groupId: GID-wakatest
#  topic: waka-test
#  username: 4derRb4Sw5EkqUMI
#  password: v50N97wf4av8Q8I4

knife4j:
  enable: true
  basic:
    enable: true
    username: admin
    password: 111111

debug_model: true

# Swagger配置
swagger:
  host: dmtest.ahapp.net
  title: ${project.name}接口文档
  description: ${project.name}接口文档
  enabled: true
  context-path: /erp_api
  # ç¦ç”¨swagger时的重定向地址
  redirect-uri: /

########################同步数据模式  ########################
data-sync:
  org-user-data-origin: 1 #组织数据 0自建 2以海康为主 1华晟ERP系统
  visitor-data-origin: 1 #访客数据 0自建 2以海康为主 1华晟ERP系统
  need-deal-img: true #是否需要处理图片数据

########################微信支付相关配置########################
wx:
  pay:
    appId: wxfab6da18632e28de
    appSecret: 4ee3b22afa90287834319fc3c1635271
    mchId: 1229817002
    mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
    notifyUrl: https://dmtest.ahapp.net/smartmeeting_interface/web/api/wxPayNotify
    keyPath: /usr/local/apiclient_cert.p12

tencent:
  map:
    remoteHost: https://apis.map.qq.com
    appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ


des_pwd: 123456SDFKDJF

## MQTT##
mqtt:
  host: tcp://192.168.10.198:1883
  userName: root
  passWord: 123456
  qos: 1
  clientId: ClientId_local #ClientId_local必须唯一 æ¯”如你已经定了叫ABC  é‚£ä½ å°±ä¸€ç›´å«ABC  å…¶ä»–地方就不要使用ABC了
  timeout: 10
  keepalive: 20
  topic1: A/pick/warn/#  #符号是代表整个warn下面的全部子主题 æ²¡æœ‰ç†è§£çš„话 å¯ä»¥ç™¾åº¦ä»”细理解一下
  topic2: A/cmd/resp
  topic3: ABCF
  topic4: ABCH

 server/dmvisit_service/src/main/resources/application-testYL.yml

@@ -6,7 +6,12 @@
    password: rtjgfEr@&0c0m
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource

  redis:
    #    database: 0
    host: 127.0.0.1
    port: 6379
    password:
    timeout: 5000      # è¿žæŽ¥æ± ä¸­çš„最小空闲连接
  jackson:
    time-zone: GMT+8
    date-format: yyyy-MM-dd HH:mm:ss

 server/dmvisit_web/src/main/resources/application.yml

@@ -10,7 +10,7 @@
  #  application:
  #    name: doumeemes
  profiles:
    active: dev
    active: testHS

  # JSON返回配置
  jackson:

 server/openapi/src/main/resources/application.yml

@@ -10,7 +10,7 @@
  #  application:
  #    name: doumeemes
  profiles:
    active: test
    active: testHS

  # JSON返回配置
  jackson: