Merge remote-tracking branch 'origin/master'

h5app/public/index.html

@@ -23,6 +23,9 @@
 
     <meta http-equiv="Cache-Control" content="no-cache, must-revalidate" />
 
+    <script type="text/javascript" src="http://api.tianditu.gov.cn/api?v=4.0&tk=e9ece4c8c4db9f3f7a7511c595eceb67"></script>
+
+
     <style type="text/css">
         .appLoading {
             width: 100%;

h5app/src/api/position/index.ts

@@ -1,12 +1,29 @@
 import {request} from '@/utils/request';
 
-export function saveLongitudeLatitude(data:any) {
+export function saveLongitudeLatitude(data: any) {
     return request(
         {
             url: 'longitudeLatitude/save',
             method: 'post',
             data: data,
         },
-        { isNew: true },
+        {isNew: true},
+    );
+}
+
+export function getLongitudeLatitudeList(userId: string, startDate: any, endDate: any) {
+    return request<any>(
+        {
+            url: 'longitudeLatitude/list',
+            method: 'get',
+            params: {
+                userId: userId,
+                startDate: startDate,
+                endDate: endDate
+            },
+        },
+        {
+            isNew: true,
+        },
     );
 }

h5app/src/router/index.ts

@@ -145,6 +145,10 @@ const routes: Array<RouteRecordRaw> = [
                 path: 'tabWork',
                 component: () => import('@/views/sapp/tabWork.vue'),
             },
+            {
+                path: 'tabWork/work/track/index',
+                component: () => import('@/views/pages/work/track/index.vue')
+            },
             {
                 path: 'tabUser',
                 component: () => import('@/views/sapp/tabUser.vue')

h5app/src/views/pages/demo/edit.vue

@@ -95,6 +95,8 @@
              </div>-->
 
       <b-image :file-ref-id="fileRefId" :readonly="false" :is-single="false"></b-image>
+
+      <div id='mapDiv' style='position: absolute; width: 100%; height: 100%; z-index: 100'></div>
     </ion-content>
 
   </ion-page>
@@ -110,6 +112,26 @@ export default defineComponent({
   components: {BQrScan, BImage},
   setup() {
     const fileRefId = "11111";//文件关键业务ID
+    const initMap = () => {
+      const T = window.T;
+      const zoom = 12;
+
+      //初始化地图对象
+      const map = new T.Map("mapDiv");
+      //设置显示地图的中心点和级别
+      map.centerAndZoom(new T.LngLat(116.40969, 39.94940), zoom);
+      const points = [];
+      points.push(new T.LngLat(116.41239, 39.97569));
+      points.push(new T.LngLat(116.412799, 39.9068));
+      points.push(new T.LngLat(116.32970, 39.92940));
+      points.push(new T.LngLat(116.385440, 39.90610));
+      //创建线对象
+      const line = new T.Polyline(points);
+      //向地图上添加线
+      map.addOverLay(line);
+    }
+
+    window.onload = initMap;
     return {
       fileRefId
     }

h5app/src/views/pages/jobhunt/recommend/recommendPost.vue

@@ -37,7 +37,7 @@
       <div class="bw-vue-list">
         <div class="list-content">
           <ion-list>
-            <ion-item v-for="(record,key) in dataList" :key="key">
+            <ion-item v-for="(record,key) in dataList" :key="key" :role="key">
               <ion-label>
                 <h2>{{ record.professionName }}</h2>
                 <p>单位：{{ record.companyName }}</p>
@@ -59,7 +59,7 @@
         </div>
       </div>
       <b-empty v-if="dataList.length<=0" :loading="loading"/>
-      <ion-infinite-scroll threshold="100px" @ionInfinite="onScroll($event)">
+      <ion-infinite-scroll threshold="50px" @ionInfinite="onScroll($event)">
         <ion-infinite-scroll-content
             :loadingText="pagination.total>pagination.pageIndex*pagination.pageSize?'正在加载...':'暂无更多'"
             loadingSpinner="bubbles">
@@ -83,7 +83,7 @@ import BEmpty from "@/components/empty.vue";
 
 export default defineComponent({
   name: 'RecommendJobList',
-  components: {IonIcon,BEmpty},
+  components: {IonIcon, BEmpty},
   setup() {
     const loading = ref(true);
     const router = useRouter();
@@ -166,16 +166,6 @@ export default defineComponent({
       recommendWhereList.value[0].check = true;
     }
 
-    const onScroll = (e: any) => {
-      setTimeout(() => {
-        e.target.complete();
-        if (pagination.value.total.value > pagination.value.pageIndex * pagination.value.pageSize) {
-          searchParams.pageIndex += 1;
-          loadData();
-        }
-      }, 500);
-    }
-
     const onRecommend = (item: any) => {
       addRecommendList.value.push({
         recommendMgtID: item.recommendMgtID,
@@ -233,6 +223,16 @@ export default defineComponent({
       loadData();
     }
 
+    const onScroll = (e: any) => {
+      setTimeout(() => {
+        if (pagination.value.total.value > pagination.value.pageIndex * pagination.value.pageSize) {
+          searchParams.pageIndex += 1;
+          loadData();
+        }
+        e.target.complete();
+      }, 500);
+    }
+
     const reloadSearchParams = () => {
       searchParams.jobHuntID = route.query.jobHuntID as any;
       searchParams.jobUserName = route.query.jobUserName as any;

h5app/src/views/pages/post/recommendJob.vue

@@ -51,7 +51,7 @@
         </div>
       </div>
       <b-empty v-if="dataList.length<=0" :loading="loading"/>
-      <ion-infinite-scroll threshold="100px" @ionInfinite="onScroll($event)">
+      <ion-infinite-scroll threshold="50px" @ionInfinite="onScroll($event)">
         <ion-infinite-scroll-content
             :loadingText="pagination.total>pagination.pageIndex*pagination.pageSize?'正在加载...':'暂无更多'"
             loadingSpinner="bubbles">
@@ -160,11 +160,11 @@ export default defineComponent({
 
     const onScroll = (e: any) => {
       setTimeout(() => {
-        e.target.complete();
         if (pagination.value.total.value > pagination.value.pageIndex * pagination.value.pageSize) {
           searchParams.pageIndex += 1;
           loadData();
         }
+        e.target.complete();
       }, 500);
     }
 

h5app/src/views/pages/work/track/index.vue

@@ -0,0 +1,126 @@
+<template>
+  <ion-page class="list-page">
+    <ion-header class="header-theme2 header-theme3">
+      <ion-toolbar>
+        <ion-title>工作轨迹</ion-title>
+      </ion-toolbar>
+    </ion-header>
+    <ion-content>
+      <ion-item class="search-item">
+        <ion-input type="date" v-model="startDate"></ion-input>
+        <ion-button slot="end"
+                    style="height: 33px;width: 70px;margin-left: 10px;--box-shadow: none;--border-radius: 14px;"
+                    @click="search">查询
+        </ion-button>
+      </ion-item>
+      <div id='mapDiv' style='position: absolute; width: 100%; height: 100%; z-index: 100'></div>
+    </ion-content>
+
+  </ion-page>
+</template>
+<script>
+import {defineComponent, ref} from "vue";
+import {getLongitudeLatitudeList} from "../../../../api/position";
+import {alertController, onIonViewDidEnter} from "@ionic/vue";
+import {useUserStore} from "../../../../store/modules/user";
+import dayjs from 'dayjs';
+
+const presentAlert = async (header, message) => {
+  const alert = await alertController.create({
+    header: header,
+    message: message,
+    buttons: [
+      '确定'
+    ],
+  });
+
+  await alert.present();
+}
+
+export default defineComponent({
+  name: 'user_track',
+  setup() {
+    const userStore = useUserStore();
+    const user = ref(userStore.getUserInfo);
+    const startDate = ref(dayjs(new Date()).format('YYYY-MM-DD'));
+    let trackList = [];
+    const T = window.T;
+    const zoom = 14;
+    let map = null;
+    let line = null;
+
+    const getTrackList = async () => {
+      trackList = await getLongitudeLatitudeList(user.value.userID, startDate.value, startDate.value);
+    };
+
+    const setLine = async () => {
+      //删除线
+      if (line != null)
+        map.removeOverLay(line);
+
+      try {
+        await getTrackList();
+      } catch (e) { /* empty */
+      }
+
+      if (trackList.length == 0) {
+        presentAlert('提示', '当日无轨迹');
+        //设置显示地图的中心点和级别
+        map.centerAndZoom(new T.LngLat(114.40, 23.08), zoom);//惠州市
+        return;
+      }
+
+      const center = trackList[0];
+
+      map.centerAndZoom(new T.LngLat(center.longitude, center.latitude), zoom);
+
+      const points = trackList.map(track => {
+        return new T.LngLat(track.longitude, track.latitude)
+      });
+
+      //创建线对象
+      line = new T.Polyline(points, {
+        color: "#c00020"
+      });
+
+      //向地图上添加线
+      map.addOverLay(line);
+
+    }
+
+    const initMap = () => {
+      //初始化地图对象
+      map = new T.Map("mapDiv");
+
+      setLine();
+    }
+
+    const search = () => {
+      setLine();
+    };
+
+    /*window.onload = initMap;*/
+
+    onIonViewDidEnter(() => {
+      initMap();
+    });
+
+    return {
+      startDate,
+      search
+    }
+  }
+});
+</script>
+<style lang="less">
+.search-item {
+  ion-input {
+    border: 1px solid #f2f2f5;
+    border-radius: 14px;
+    width: 150px !important;
+    --padding-start: 10px !important;
+    --padding-top: 7px !important;
+    --padding-bottom: 5px !important;
+  }
+}
+</style>

h5app/src/views/sapp/tabWork.vue

@@ -126,12 +126,18 @@
                </div>
                <div class="tool-title">驿站地图</div>
              </a>
-             <a class="tool-item box-line"  @click="router.push('/tabs/tabMain/demo/edit')">
+             <a class="tool-item box-line"  @click="router.push('/tabs/tabWork/work/track/index')">
                <div class="tool-img">
                  <img src="@/assets/icon/map.png">
                </div>
-               <div class="tool-title">表单样式</div>
+               <div class="tool-title">工作轨迹</div>
              </a>
+<!--             <a class="tool-item box-line"  @click="router.push('/tabs/tabMain/demo/edit')">
+               <div class="tool-img">
+                 <img src="@/assets/icon/map.png">
+               </div>
+               <div class="tool-title">表单样式</div>
+             </a>-->
            </div>
          </div>
        </div>

h5app/vue.config.js

@@ -3,7 +3,7 @@ module.exports = {
 
     devServer: {
         port: 8202,
-        https:true,
+        https: false,
         client: {
             progress: true,
         },

src/main/java/com/hz/employmentsite/controller/AccountController.java

@@ -84,8 +84,8 @@ public class AccountController {
         if (user == null)
             throw new BaseException(BaseErrorEnum.USER_PASSWORD_ERROR);
 
-        if (!Arrays.asList(appLoginUserType).contains(user.getUserTypeId()))
-            throw new BaseException(BaseErrorEnum.APP_LOGIN_ERROR);
+        if (!Arrays.asList(appLoginUserType).contains(user.getUserTypeId()) || !userService.isSiteUser(user.getUserId()))
+            throw new BaseException("10004","请使用驿站工作者账号登录！");
 
         user.token = TokenUtils.sign(user.getUserId() + '|' + user.getUserTypeId());
         user.dataRangeList = userService.getUserDataRange(user.getUserId());

src/main/java/com/hz/employmentsite/controller/LongitudeLatitudeController.java

@@ -4,12 +4,12 @@ import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.model.PcLongitudeLatitude;
 import com.hz.employmentsite.services.service.LongitudeLatitudeService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.hz.employmentsite.vo.taskAndLog.PcLongitudeLatitudeVo;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
 
 @RestController
 @RequestMapping("/api/longitudeLatitude")
@@ -23,4 +23,9 @@ public class LongitudeLatitudeController {
         return RespGenerstor.success(longitudeLatitudeService.save(data));
     }
 
+    @GetMapping("list")
+    public BaseResponse<List<PcLongitudeLatitudeVo>> list(@RequestParam("userId") String userId, @RequestParam("startDate") Date startDate, @RequestParam("endDate") Date endDate) {
+        return RespGenerstor.success(longitudeLatitudeService.list(userId, startDate, endDate));
+    }
+
 }

src/main/java/com/hz/employmentsite/controller/companyService/CompanyController.java

@@ -134,7 +134,7 @@ public class CompanyController {
         } else {
             ExcelHelper excelHelper = new ExcelHelper();
             ExcelHelper.ExcelData data = excelHelper.new ExcelData();
-            data.setTitles(Arrays.asList(new String[]{"序号", "企业名称", "所属县区", "所属街道", "统一信用代码", "企业状态", "参保人数", "企业规模", "当前岗位数量", "录入人", "录入时间"}));
+            data.setTitles(Arrays.asList(new String[]{"序号", "企业名称", "所属县区", "所属街道", "所属驿站", "统一信用代码", "企业状态", "参保人数", "企业规模", "当前岗位数量", "录入人", "录入时间"}));
             int i = 0;
             List<List<Object>> rowDatas = new ArrayList();
             for (CompanyVo item : result.getList()) {
@@ -145,6 +145,7 @@ public class CompanyController {
                 row.add(item.companyName);
                 row.add(item.regionName);
                 row.add(item.streetName);
+                row.add(item.SiteName);
                 row.add(item.companyCode);
                 row.add(recordName);
                 row.add(item.insuredCount);

src/main/java/com/hz/employmentsite/controller/companyService/PostController.java

@@ -144,7 +144,7 @@ public class PostController {
         } else {
             ExcelHelper excelHelper = new ExcelHelper();
             ExcelHelper.ExcelData data = excelHelper.new ExcelData();
-            data.setTitles(Arrays.asList(new String[]{"序号", "岗位名称", "招聘人数","开始日期", "结束日期", "招聘企业", "岗位状态", "工种名称", "文化程度", "薪酬", "联系人", "联系电话"}));
+            data.setTitles(Arrays.asList(new String[]{"序号", "岗位名称", "招聘人数", "开始日期", "结束日期", "招聘企业", "所属驿站", "岗位状态", "工种名称", "文化程度", "薪酬", "联系人", "联系电话"}));
             int i = 0;
             List<List<Object>> rowsData = new ArrayList();
             for (PostVo item : result.getList()) {
@@ -156,6 +156,7 @@ public class PostController {
                 row.add(dateUtils.dateToStr(item.startTime));
                 row.add(dateUtils.dateToStr(item.endTime));
                 row.add(item.companyName);
+                row.add(item.getSiteName());
                 row.add(item.recordStatus == 1 ? "启用" : "停用");
                 row.add(item.workName);
                 row.add(item.cultureLevelName);

src/main/java/com/hz/employmentsite/mapper/cquery/LongitudeLatitudeCQuery.java

@@ -0,0 +1,13 @@
+package com.hz.employmentsite.mapper.cquery;
+
+import com.hz.employmentsite.vo.taskAndLog.PcLongitudeLatitudeVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+public interface LongitudeLatitudeCQuery {
+
+    List<PcLongitudeLatitudeVo> selectList(@Param("userName") String userName, @Param("userId") String userId, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
+}

src/main/java/com/hz/employmentsite/services/impl/LongitudeLatitudeServiceImpl.java

@@ -1,11 +1,16 @@
 package com.hz.employmentsite.services.impl;
 
 import com.hz.employmentsite.mapper.PcLongitudeLatitudeMapper;
+import com.hz.employmentsite.mapper.cquery.LongitudeLatitudeCQuery;
 import com.hz.employmentsite.model.PcLongitudeLatitude;
 import com.hz.employmentsite.services.service.LongitudeLatitudeService;
+import com.hz.employmentsite.vo.taskAndLog.PcLongitudeLatitudeVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
 import java.util.UUID;
 
 @Service
@@ -14,6 +19,9 @@ public class LongitudeLatitudeServiceImpl implements LongitudeLatitudeService {
     @Resource
     private PcLongitudeLatitudeMapper pcLongitudeLatitudeMapper;
 
+    @Autowired
+    private LongitudeLatitudeCQuery longitudeLatitudeCQuery;
+
     @Override
     public Integer save(PcLongitudeLatitude data) {
         Integer result = 0;
@@ -22,4 +30,9 @@ public class LongitudeLatitudeServiceImpl implements LongitudeLatitudeService {
 
         return result;
     }
+
+    @Override
+    public List<PcLongitudeLatitudeVo> list(String userId, Date startDate, Date endDate) {
+        return longitudeLatitudeCQuery.selectList(null, userId, startDate, endDate);
+    }
 }

src/main/java/com/hz/employmentsite/services/impl/UserServiceImpl.java

@@ -386,4 +386,13 @@ public class UserServiceImpl implements UserService {
         return dbData;
     }
 
+    public boolean isSiteUser(String userId) {
+        SysUserSysRoleExample exp = new SysUserSysRoleExample();
+        SysUserSysRoleExample.Criteria cri = exp.or();
+        cri.andUserIDEqualTo(userId);
+        cri.andRoleIDEqualTo(siteRoleId);
+
+        return sysUserSysRoleMapper.selectByExample(exp).size() > 0;
+    }
+
 }

src/main/java/com/hz/employmentsite/services/service/LongitudeLatitudeService.java

@@ -1,7 +1,13 @@
 package com.hz.employmentsite.services.service;
 
 import com.hz.employmentsite.model.PcLongitudeLatitude;
+import com.hz.employmentsite.vo.taskAndLog.PcLongitudeLatitudeVo;
+
+import java.util.Date;
+import java.util.List;
 
 public interface LongitudeLatitudeService {
     Integer save(PcLongitudeLatitude data);
+
+    List<PcLongitudeLatitudeVo> list(String userId, Date startDate,Date endDate);
 }

src/main/java/com/hz/employmentsite/services/service/UserService.java

@@ -34,4 +34,6 @@ public interface UserService {
 
     SysUser addSiteUser(String userId,String loginId, String name, String createUserId);
 
+    boolean isSiteUser(String userId);
+
 }

src/main/java/com/hz/employmentsite/vo/taskAndLog/PcLongitudeLatitudeVo.java

@@ -0,0 +1,9 @@
+package com.hz.employmentsite.vo.taskAndLog;
+
+import com.hz.employmentsite.model.PcLongitudeLatitude;
+import lombok.Data;
+
+@Data
+public class PcLongitudeLatitudeVo extends PcLongitudeLatitude {
+    public String userName;
+}

src/main/resources/mapping/cquery/LongitudeLatitudeCQuery.xml

@@ -0,0 +1,23 @@
+<?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.hz.employmentsite.mapper.cquery.LongitudeLatitudeCQuery">
+    <select id="selectList" resultType="com.hz.employmentsite.vo.taskAndLog.PcLongitudeLatitudeVo">
+        select l.longitudeLatitudeId,l.userId,l.time,l.longitude,l.latitude,us.Name as userName
+        from pc_longitude_latitude l
+        inner join sys_user us on l.userID = us.userID
+        where 1=1
+        <if test="userName!='' and userName!=null">
+            and us.name like Concat('%',#{userName},'%')
+        </if>
+        <if test="userId!='' and userId!=null">
+            and us.userId = #{userId}
+        </if>
+        <if test="startDate != null">
+            and l.Time <![CDATA[ >= ]]> #{startDate}
+        </if>
+        <if test="endDate != null ">
+            and l.Time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day)
+        </if>
+        order by l.Time
+    </select>
+</mapper>

vue/src/views/companyService/company/detail.vue

@@ -23,9 +23,7 @@
       <a-descriptions-item :span="3" label="官网网址">{{ companyInfo.website }}</a-descriptions-item>
       <a-descriptions-item :span="3" label="企业福利">{{ companyInfo.bonus }}</a-descriptions-item>
     </a-descriptions>
-    <a-divider orientation="left">附件照片</a-divider>
-    <b-upload-file :fileRefId="companyInfo.companyID" :readonly="true" :multiple="true" style="width: 100%;"
-                   :setFileList="setFileList" :accept="'.pdf,.png,.jpg'"></b-upload-file>
+
     <a-divider orientation="left">其他信息</a-divider>
     <a-descriptions bordered>
       <a-descriptions-item label="法定代表人(负责人)">{{ companyInfo.frName }}</a-descriptions-item>
@@ -42,6 +40,9 @@
       <a-descriptions-item :span="3" label="经营范围">{{ companyInfo.businScope }}</a-descriptions-item>
       <a-descriptions-item :span="3" label="企业简介">{{ companyInfo.companyDesc }}</a-descriptions-item>
     </a-descriptions>
+    <a-divider orientation="left">附件照片</a-divider>
+    <b-upload-file :fileRefId="companyInfo.companyID" :readonly="true" :multiple="true" style="width: 100%;"
+                   :setFileList="setFileList" :accept="'.pdf,.png,.jpg'"></b-upload-file>
   </div>
 </template>
 

vue/src/views/companyService/company/index.vue

@@ -201,6 +201,7 @@ export default defineComponent({
       {title: '企业名称', dataIndex: 'companyName', key: 'companyName',width: 200, align: "center"},
       {title: '所属县区', dataIndex: 'regionName', key: 'regionName', width: 120, align: "center"},
       {title: '所属街道', dataIndex: 'streetName', key: 'streetName', width: 120,align: "center"},
+      {title: '所属驿站', dataIndex: 'siteName', key: 'siteName', width: 200, align: "center"},
       {title: '统一信用代码', dataIndex: 'companyCode', key: 'companyCode', width: 200,align: "center"},
       {
         title: '企业状态', dataIndex: 'recordStatus', key: 'recordStatus',width: 120, align: "center", customRender: (item) => {

vue/src/views/companyService/post/index.vue

@@ -197,7 +197,8 @@ export default defineComponent({
           return item.record.endTime == null ? "" : (dayjs(item.record.endTime).format('YYYY-MM-DD'))
         }
       },
-      {title: '招聘企业', dataIndex: 'companyName', key: 'companyName', align: "center"},
+      {title: '招聘企业', dataIndex: 'companyName', key: 'companyName', width: 200, align: "center"},
+      {title: '所属驿站', dataIndex: 'siteName', key: 'siteName', width: 200, align: "center"},
       {
         title: '岗位状态', dataIndex: 'recordStatus', key: 'recordStatus', align: "center", customRender: (item) => {
           return item.record.recordStatus == 1 ? "启用" : "停用";