优化包结构，及巡更配置提交

czt

2025-12-22 a995b7c16f4f111007edbdcba1e79af969c5193a

优化包结构，及巡更配置提交

 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolConfService.java

ÎļþÒÑɾ³ý

 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolRecordService.java

ÎļþÒÑɾ³ý

 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java

@@ -2,12 +2,16 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.Patrol;
import com.fzzy.igds.domain.PatrolConf;
import com.fzzy.igds.domain.PatrolRecord;
import com.fzzy.igds.mapper.PatrolConfMapper;
import com.fzzy.igds.mapper.PatrolMapper;
import com.fzzy.igds.mapper.PatrolRecordMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.DateUtil;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -21,89 +25,13 @@

    @Resource
    private PatrolMapper patrolMapper;
    @Resource
    private PatrolRecordMapper patrolRecordMapper;
    @Resource
    private PatrolConfMapper patrolConfMapper;

    public List<Patrol> selectList(Patrol param) {
        QueryWrapper<Patrol> queryWrapper = getQueryWrapper(param);
        return patrolMapper.selectList(queryWrapper);
    }

    /**
     * å°è£…查询条件
     *
     * @param param
     */
    public QueryWrapper<Patrol> getQueryWrapper(Patrol param) {
        QueryWrapper<Patrol> queryWrapper = new QueryWrapper<>();

        param.setCompanyId(ContextUtil.getCompanyId());
        queryWrapper.eq("company_id", param.getCompanyId());

        if (StringUtils.isNotBlank(param.getDeptId())) {
            queryWrapper.eq("dept_id", param.getDeptId());
        }

        if (StringUtils.isNotBlank(param.getUserName())) {
            queryWrapper.like("user_name", param.getUserName());
        }
        if (StringUtils.isNotBlank(param.getConfName())) {
            queryWrapper.like("conf_name", param.getConfName());
        }

        queryWrapper.orderByDesc("create_time");

        return queryWrapper;
    }

    /**
     * é€šè¿‡id查询单条数据
     *
     * @param id
     * @author sgj
     * @date 2025/12/10
     */
    public Patrol selectById(String id) {
        return patrolMapper.selectById(id);
    }

    /**
     * æ–°å¢žæ•°æ®
     *
     * @param param
     * @author sgj
     * @date 2025/12/10
     */
    public int insertData(Patrol param) {
        if (StringUtils.isEmpty(param.getId())) {
            param.setId(ContextUtil.generateId());
        }
        return patrolMapper.insert(param);
    }

    /**
     * æ›´æ–°æ•°æ®
     *
     * @param param
     * @author sgj
     * @date 2025/12/10
     */
    public int updateData(Patrol param) {
        return patrolMapper.updateById(param);
    }

    /**
     * é€šè¿‡id删除一条数据
     *
     * @param ids
     * @author sgj
     * @date 2025/12/10
     */
    public void deleteDataById(String ids) {
        String[] recordIds = Convert.toStrArray(ids);
        for (String recordId : recordIds) {
            patrolMapper.deleteById(recordId);
        }
    }

    /*--------------------巡更主表管理------------------*/
    /**
     * æŸ¥è¯¢7天内的所有巡更记录信息
     * 
@@ -146,4 +74,72 @@

        patrolMapper.selectPage(page, queryWrapper);
    }

    /*--------------------巡更轨迹表管理------------------*/
    /**
     * æ ¹æ®å·¡æ›´ID查询具体点位信息
     * @param patrolId
     * @return
     */
    public List<PatrolRecord> getRecordByPatrolId(String patrolId) {

        if(StringUtils.isBlank(patrolId)){
            return null;
        }

        QueryWrapper<PatrolRecord> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("patrol_id", patrolId);
        queryWrapper.orderByDesc("id");

        return patrolRecordMapper.selectList(queryWrapper);
    }


    /*--------------------巡更配置表管理------------------*/
    /**
     * æŸ¥è¯¢åº“区下所有配置信息
     * @param param
     * @return
     */
    public List<PatrolConf> listPatrolConf(IgdsBaseParam param) {

        if(null ==  param){
            param = new IgdsBaseParam();
        }
        QueryWrapper<PatrolConf> queryWrapper = new QueryWrapper<>();
        if(StringUtils.isNotEmpty(param.getName())){
            queryWrapper.like("name", param.getName());
        }
        if(StringUtils.isNotBlank(param.getDeptId())){
            queryWrapper.like("dept_id", param.getDeptId());
        }else {
            if(StringUtils.isNotBlank(param.getCompanyId())){
                queryWrapper.likeRight("dept_id", param.getCompanyId());
            }
        }
        return patrolConfMapper.selectList(queryWrapper);
    }

    public BaseResp addPatrolConf(PatrolConf conf) {
        conf.setId(ContextUtil.generateId());
        conf.setCompanyId(ContextUtil.getCompanyId());
        conf.setUpdateBy(ContextUtil.getLoginUserName());
        conf.setUpdateTime(new Date());
        conf.setCreateBy(ContextUtil.getLoginUserName());
        conf.setCreateTime(new Date());

        return patrolConfMapper.insert(conf) > 0 ? BaseResp.success() : BaseResp.error("添加失败");
    }

    public BaseResp updatePatrolConf(PatrolConf conf) {
        conf.setUpdateBy(ContextUtil.getLoginUserName());
        conf.setUpdateTime(new Date());
        return patrolConfMapper.updateById(conf) > 0 ? BaseResp.success() : BaseResp.error("更新失败");
    }

    public BaseResp deletePatrolConf(PatrolConf conf) {
        return patrolConfMapper.deleteById(conf) > 0 ? BaseResp.success() : BaseResp.error("删除失败");
    }


}

 fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml

@@ -74,7 +74,7 @@
    if(select){&#xD;
        var patrolId = select.get(&quot;id&quot;);&#xD;
        &#xD;
        var url = &quot;/security/patrol/patrolRecord/&quot;+patrolId+&quot;?time=&quot;+ new Date().getTime();&#xD;
        var url = &quot;/security/patrol-record?patrolId=&quot;+patrolId+&quot;&amp;time=&quot;+ new Date().getTime();&#xD;
        &#xD;
        view.get(&quot;#iFrameTrack&quot;).set(&quot;path&quot;,url);&#xD;
        view.get(&quot;#dialogTrack&quot;).show();&#xD;
@@ -96,7 +96,7 @@
    <Container>
      <Property name="className">c-param</Property>
      <AutoForm>
        <Property name="cols">*,*,*,*,90,90</Property>
        <Property name="cols">*,*,*,*,90,90,120</Property>
        <Property name="dataSet">dsParam</Property>
        <Property name="labelAlign">right</Property>
        <Property name="labelWidth">100</Property>
@@ -137,6 +137,15 @@
          <Property name="exClassName">btn-q2</Property>
          <Property name="iconClass">fa fa-refresh</Property>
        </Button>
        <Button>
          <ClientEvent name="onClick">
            var url = &quot;/com.fzzy.igds.PatrolConf.d&quot;;&#xD;
            window.$openTab(&quot;巡更配置&quot;, url);
          </ClientEvent>
          <Property name="caption">巡更配置</Property>
          <Property name="exClassName">btn-q1</Property>
          <Property name="iconClass">fa fa-plus-square</Property>
        </Button>
      </AutoForm>
    </Container>
    <Container>

 fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolConf.view.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,211 @@
<?xml version="1.0" encoding="UTF-8"?>
<ViewConfig>
  <Arguments/>
  <Context/>
  <Model/>
  <View layout="padding:10">
    <ClientEvent name="onClick">&#xD;
/**&#xD;
* æŸ¥è¯¢&#xD;
*/&#xD;
query = function(){&#xD;
    view.get(&quot;#dsMain&quot;).flushAsync();&#xD;
}&#xD;</ClientEvent>
    <Property name="packages">font-awesome,css-common</Property>
    <DataSet id="dsMain">
      <Property name="loadMode">lazy</Property>
      <Property name="dataType">[dtPatrolConf]</Property>
      <Property name="dataProvider">patrolPR#listPatrolConf</Property>
    </DataSet>
    <DataSet id="dsParam">
      <ClientEvent name="onReady">self.insert({});</ClientEvent>
      <Property name="dataType">dtBaseParam</Property>
    </DataSet>
    <Container>
      <Property name="className">c-param</Property>
      <AutoForm>
        <Property name="cols">*,90,90,*,*</Property>
        <Property name="dataSet">dsParam</Property>
        <Property name="labelAlign">right</Property>
        <AutoFormElement>
          <Property name="name">name</Property>
          <Property name="property">name</Property>
          <Property name="label">班次名称</Property>
          <Property name="labelWidth">90</Property>
          <Editor/>
        </AutoFormElement>
        <Button>
          <ClientEvent name="onClick">var param = view.get(&quot;#dsParam.data&quot;);&#xD;
console.log(&quot;param&quot;);&#xD;
view.get(&quot;#dsMian&quot;).set(&quot;parameter&quot;,param).flushAsync();&#xD;
</ClientEvent>
          <Property name="caption">搜索</Property>
          <Property name="iconClass">fa fa-search</Property>
          <Property name="exClassName">btn-q1</Property>
        </Button>
        <Button>
          <ClientEvent name="onClick">view.get(&quot;#dsParam&quot;).set(&quot;data&quot;,{});</ClientEvent>
          <Property name="caption">重置</Property>
          <Property name="exClassName">btn-q2</Property>
          <Property name="iconClass">fa fa-refresh</Property>
        </Button>
      </AutoForm>
    </Container>
    <Container>
      <Property name="className">c-data</Property>
      <ToolBar>
        <ToolBarButton>
          <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).insert({});&#xD;
view.get(&quot;#dialogMain&quot;).show();</ClientEvent>
          <Property name="caption">新增</Property>
          <Property name="exClassName">btn1</Property>
          <Property name="width">100</Property>
          <Property name="iconClass">fa fa-plus</Property>
        </ToolBarButton>
        <ToolBarButton>
          <ClientEvent name="onClick">var data = view.get(&quot;#dgMain&quot;).get(&quot;selection&quot;);
view.get(&quot;#dialogMain&quot;).show();
        </ClientEvent>
          <Property name="id">btnUpdate</Property>
          <Property name="caption">修改</Property>
          <Property name="exClassName">btn2</Property>
          <Property name="width">100</Property>
          <Property name="iconClass">fa fa-pencil-square-o</Property>
        </ToolBarButton>
        <ToolBarButton>
          <ClientEvent name="onClick">var data = view.get(&quot;#dgMain&quot;).get(&quot;selection&quot;)
if(!data){
    $alert(&quot;请选择数据&quot;);
    }else{
    view.get(&quot;#ajaxDelData&quot;).set(&quot;parameter&quot;, data).execute(function(result){
        if(&quot;200&quot;!=result.code){
            $alert(&quot;异常信息：&quot;+result.message);
        }else{
            $notify(&quot;执行成功&quot;);
            query();&#xD;
        }
    })
}</ClientEvent>
          <Property name="caption">删除</Property>
          <Property name="exClassName">btn3</Property>
          <Property name="width">100</Property>
          <Property name="iconClass">fa fa-times</Property>
        </ToolBarButton>
      </ToolBar>
      <DataGrid id="dgMain" layoutConstraint="padding:8" selectionMode="singleRow">
        <ClientEvent name="onDataRowClick">self.set(&quot;selection&quot;, arg.data)</ClientEvent>
        <Property name="dataSet">dsMain</Property>
        <Property name="readOnly">true</Property>
        <RowSelectorColumn/>
        <RowNumColumn/>
        <DataColumn name="name">
          <Property name="property">name</Property>
          <Property name="align">center</Property>
          <Property name="width">400</Property>
        </DataColumn>
        <DataColumn name="start">
          <Property name="property">start</Property>
          <Property name="align">center</Property>
          <Property name="width">160</Property>
        </DataColumn>
        <DataColumn name="end">
          <Property name="property">end</Property>
          <Property name="align">center</Property>
          <Property name="width">160</Property>
        </DataColumn>
        <DataColumn name="remark">
          <Property name="property">remark</Property>
        </DataColumn>
        <DataColumn name="updateBy">
          <Property name="property">updateBy</Property>
          <Property name="align">center</Property>
          <Property name="width">160</Property>
        </DataColumn>
        <DataColumn name="updateTime">
          <Property name="property">updateTime</Property>
          <Property name="align">center</Property>
          <Property name="width">200</Property>
        </DataColumn>
      </DataGrid>
    </Container>
    <Dialog id="dialogMain">
      <Property name="width">550</Property>
      <Property name="caption">巡更配置信息</Property>
      <Property name="closeable">false</Property>
      <Property name="iconClass">fa fa-tasks</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">view.get(&quot;#saveAction&quot;).execute(function(){&#xD;
    self.get(&quot;parent&quot;).hide();&#xD;
});</ClientEvent>
          <Property name="caption">保存</Property>
          <Property name="iconClass">fa fa-check-circle</Property>
          <Property name="exClassName">btn1</Property>
          <Property name="width">120</Property>
        </Button>
        <Button>
          <ClientEvent name="onClick">view.get(&quot;#dsMain.data:#&quot;).cancel();&#xD;
self.get(&quot;parent&quot;).hide();</ClientEvent>
          <Property name="caption">取消</Property>
          <Property name="exClassName">btn3</Property>
          <Property name="iconClass">fa fa-times-circle</Property>
          <Property name="width">120</Property>
        </Button>
      </Buttons>
      <Children>
        <AutoForm layoutConstraint="padding:10">
          <Property name="cols">*</Property>
          <Property name="dataSet">dsMain</Property>
          <Property name="labelSeparator">：</Property>
          <Property name="labelAlign">right</Property>
          <Property name="labelWidth">120</Property>
          <AutoFormElement>
            <Property name="name">name</Property>
            <Property name="property">name</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">start</Property>
            <Property name="property">start</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">end</Property>
            <Property name="property">end</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">remark</Property>
            <Property name="property">remark</Property>
            <Property name="editorType">TextArea</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">updateBy</Property>
            <Property name="property">updateBy</Property>
            <Property name="readOnly">true</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">updateTime</Property>
            <Property name="property">updateTime</Property>
            <Property name="readOnly">true</Property>
            <Editor/>
          </AutoFormElement>
        </AutoForm>
      </Children>
      <Tools/>
    </Dialog>
    <UpdateAction id="saveAction">
      <Property name="dataResolver">patrolPR#saveUpdateConf</Property>
      <UpdateItem>
        <Property name="dataSet">dsMain</Property>
        <Property name="dataPath">[#current]</Property>
      </UpdateItem>
    </UpdateAction>
    <AjaxAction id="ajaxDelData">
      <Property name="confirmMessage">确定要删除数据么？</Property>
      <Property name="service">patrolPR#deletePatrolConf</Property>
    </AjaxAction>
  </View>
</ViewConfig>

 fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java

@@ -1,17 +1,19 @@
package com.fzzy.igds;

import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.data.NoticeParam;
import com.fzzy.igds.data.PatrolSuperData;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.domain.InoutNoticeIn;
import com.fzzy.igds.domain.Patrol;
import com.fzzy.igds.domain.*;
import com.fzzy.igds.service.CoreDeptService;
import com.fzzy.igds.service.PatrolService;
import com.fzzy.igds.utils.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*;

@@ -28,6 +30,7 @@
    @Resource
    private CoreDeptService coreDeptService;

    /*-------------------巡检监管统计信息--------------------*/
    /**
     * patrolPR#getData å·¡æ£€ç›‘管统计
     *
@@ -77,6 +80,7 @@
        return new ArrayList<>(map.values());
    }

    /*-------------------电子巡更记录主表信息--------------------*/
    /**
     * patrolPR#pagePatrolData èŽ·å–巡检记录信息
     *
@@ -98,4 +102,47 @@
        page.setEntityCount(Integer.parseInt(String.valueOf(corePage.getTotal())));
    }



    /*-------------------电子巡更配置信息--------------------*/

    /**
     * patrolPR#listPatrolConf
     * é“¶è¡Œåˆ—表
     */
    @DataProvider
    public List<PatrolConf> listPatrolConf(IgdsBaseParam param) {
        return patrolService.listPatrolConf(param);
    }

    /**
     * ä¿å­˜/更新
     * patrolPR#saveUpdateConf
     * @param bank
     * @return
     */
    @Transactional
    @DataResolver
    public BaseResp saveUpdateConf(PatrolConf bank){

        if(StringUtils.isEmpty(bank.getId())){
            return patrolService.addPatrolConf(bank);
        }else {
            return patrolService.updatePatrolConf(bank);
        }
    }


    /**
     * åˆ é™¤
     * patrolPR#deletePatrolConf
     * @param bank
     * @return
     */
    @Expose
    public BaseResp deletePatrolConf(PatrolConf bank){
        if(StringUtils.isNotEmpty(bank.getId())) return patrolService.deletePatrolConf(bank);
        return BaseResp.success();
    }

}

 fzzy-igdss-view/src/main/java/models/core.model.xml

@@ -1862,4 +1862,63 @@
      <Property name="label">修改人</Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtPatrolConf">
    <Property name="matchType">com.fzzy.igds.domain.PatrolConf</Property>
    <PropertyDef name="id">
      <Property></Property>
    </PropertyDef>
    <PropertyDef name="deptId">
      <Property></Property>
      <Property name="label">所属库区</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getAllData&quot;).getResult()}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">kqmc</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="name">
      <Property></Property>
      <Property name="label">班次名称</Property>
    </PropertyDef>
    <PropertyDef name="companyId">
      <Property></Property>
      <Property name="label">组织编码</Property>
    </PropertyDef>
    <PropertyDef name="userId">
      <Property></Property>
      <Property name="label">巡逻人</Property>
    </PropertyDef>
    <PropertyDef name="userName">
      <Property></Property>
      <Property name="label">巡逻人</Property>
    </PropertyDef>
    <PropertyDef name="start">
      <Property name="dataType">DateTime</Property>
      <Property name="label">班次起始时间</Property>
    </PropertyDef>
    <PropertyDef name="end">
      <Property name="dataType">DateTime</Property>
      <Property name="label">班次截止时间</Property>
    </PropertyDef>
    <PropertyDef name="remark">
      <Property></Property>
      <Property name="label">备注信息</Property>
    </PropertyDef>
    <PropertyDef name="createBy">
      <Property></Property>
      <Property name="label">创建人</Property>
    </PropertyDef>
    <PropertyDef name="createTime">
      <Property name="dataType">DateTime</Property>
      <Property name="label">创建时间</Property>
    </PropertyDef>
    <PropertyDef name="updateBy">
      <Property></Property>
      <Property name="label">更新人</Property>
    </PropertyDef>
    <PropertyDef name="updateTime">
      <Property name="dataType">DateTime</Property>
      <Property name="label">更新时间</Property>
    </PropertyDef>
  </DataType>
</Model>

 fzzy-igdss-web/src/main/java/com/fzzy/common/FileController.java

ÎļþÃû´Ó fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/file/FileController.java ÐÞ¸Ä
@@ -1,11 +1,9 @@
package com.fzzy.sys.controller.file;
package com.fzzy.common;

import com.fzzy.common.manager.CommonManager;
import com.fzzy.common.manager.FileManager;
import com.fzzy.igds.data.PageResponse;
import com.fzzy.sys.manager.common.CommonManager;
import com.fzzy.sys.manager.file.FileManager;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestMapping;

 fzzy-igdss-web/src/main/java/com/fzzy/common/PrintController.java

ÎļþÃû´Ó fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/print/PrintController.java ÐÞ¸Ä
@@ -1,5 +1,6 @@
package com.fzzy.sys.controller.print;
package com.fzzy.common;

import com.fzzy.common.manager.PrintManager;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.RespCodeEnum;
import com.fzzy.igds.data.InoutData;
@@ -7,7 +8,6 @@
import com.fzzy.igds.data.PageResponse;
import com.fzzy.igds.domain.InoutRecord;
import com.fzzy.igds.service.InoutRecordService;
import com.fzzy.sys.manager.print.PrintManager;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

 fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java

ÎļþÃû´Ó fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.sys.manager.common;
package com.fzzy.common.manager;

import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.DepotType;

 fzzy-igdss-web/src/main/java/com/fzzy/common/manager/FileManager.java

ÎļþÃû´Ó fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/file/FileManager.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.sys.manager.file;
package com.fzzy.common.manager;

import com.fzzy.igds.constant.RespCodeEnum;
import com.fzzy.igds.data.PageResponse;

 fzzy-igdss-web/src/main/java/com/fzzy/common/manager/PrintManager.java

ÎļþÃû´Ó fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/print/PrintManager.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.sys.manager.print;
package com.fzzy.common.manager;

import com.fzzy.igds.domain.InoutRecord;
import com.fzzy.igds.service.InoutRecordService;

 fzzy-igdss-web/src/main/java/com/fzzy/grain/GrainController.java

ÎļþÃû´Ó fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/grain/GrainController.java ÐÞ¸Ä
@@ -1,5 +1,6 @@
package com.fzzy.sys.controller.grain;
package com.fzzy.grain;

import com.fzzy.grain.manager.GrainManager;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.DepotType;
import com.fzzy.igds.data.*;
@@ -7,8 +8,7 @@
import com.fzzy.igds.request.ExeBaseRequest;
import com.fzzy.igds.response.GrainResponse;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.sys.manager.common.CommonManager;
import com.fzzy.sys.manager.grain.GrainManager;
import com.fzzy.common.manager.CommonManager;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;

 fzzy-igdss-web/src/main/java/com/fzzy/grain/manager/GrainExportBuilder.java

ÎļþÃû´Ó fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/grain/GrainExportBuilder.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.sys.manager.grain;
package com.fzzy.grain.manager;

import com.fzzy.igds.constant.DepotType;
import com.fzzy.igds.constant.FoodVariety;

 fzzy-igdss-web/src/main/java/com/fzzy/grain/manager/GrainManager.java

ÎļþÃû´Ó fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/grain/GrainManager.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.sys.manager.grain;
package com.fzzy.grain.manager;

import com.fzzy.igds.constant.OrderRespEnum;
import com.fzzy.igds.constant.RespCodeEnum;

 fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java

ÎļþÃû´Ó fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/group/GroupController.java ÐÞ¸Ä
@@ -1,13 +1,13 @@
package com.fzzy.sys.controller.group;
package com.fzzy.group;

import com.fzzy.group.manager.GroupManager;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.domain.DicArea;
import com.fzzy.igds.domain.Slogan;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.websocket.WebSocketPacket;
import com.fzzy.sys.manager.common.CommonManager;
import com.fzzy.sys.manager.gropu.GroupManager;
import com.fzzy.common.manager.CommonManager;
import com.ruoyi.common.core.domain.entity.SysUser;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;

 fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java

ÎļþÃû´Ó fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/gropu/GroupManager.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.sys.manager.gropu;
package com.fzzy.group.manager;

import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.domain.Dept;

 fzzy-igdss-web/src/main/java/com/fzzy/inout/InoutApiController.java

ÎļþÃû´Ó fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/inout/InoutApiController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.sys.controller.inout;
package com.fzzy.inout;

import com.fzzy.igds.camera.data.ApiCameraResp;
import com.fzzy.igds.constant.RespCodeEnum;

 fzzy-igdss-web/src/main/java/com/fzzy/inout/InoutController.java

ÎļþÃû´Ó fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/inout/InoutController.java ÐÞ¸Ä
@@ -1,15 +1,13 @@
package com.fzzy.sys.controller.inout;
package com.fzzy.inout;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.common.dto.BaseParam;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.RespCodeEnum;
import com.fzzy.igds.data.*;
import com.fzzy.igds.domain.*;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.DateUtil;
import com.fzzy.sys.manager.common.CommonManager;
import com.fzzy.sys.manager.inout.InoutManager;
import com.fzzy.common.manager.CommonManager;
import com.fzzy.inout.manager.InoutManager;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysUser;
import lombok.extern.slf4j.Slf4j;

 fzzy-igdss-web/src/main/java/com/fzzy/inout/manager/InoutManager.java

ÎļþÃû´Ó fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/inout/InoutManager.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.sys.manager.inout;
package com.fzzy.inout.manager;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.igds.constant.Constant;

 fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java

ÎļþÃû´Ó fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/EventInfoController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.sys.controller.security;
package com.fzzy.security;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.igds.constant.RespCodeEnum;
@@ -6,8 +6,8 @@
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.data.PageResponse;
import com.fzzy.igds.domain.EventInfo;
import com.fzzy.sys.manager.common.CommonManager;
import com.fzzy.sys.manager.security.EventInfoManager;
import com.fzzy.common.manager.CommonManager;
import com.fzzy.security.manager.EventInfoManager;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;

 fzzy-igdss-web/src/main/java/com/fzzy/security/SecurityController.java

ÎļþÃû´Ó fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java ÐÞ¸Ä
@@ -1,26 +1,25 @@
package com.fzzy.sys.controller.security;
package com.fzzy.security;

import com.fzzy.igds.camera.data.ApiCameraData;
import com.fzzy.igds.camera.data.ApiCameraResp;
import com.fzzy.igds.constant.CameraPlayType;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.data.PageResponse;
import com.fzzy.igds.data.PatrolSuperData;
import com.fzzy.igds.domain.Camera;
import com.fzzy.igds.domain.PatrolRecord;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.SystemUtil;
import com.fzzy.sys.manager.common.CommonManager;
import com.fzzy.sys.manager.security.SecManager;
import com.fzzy.common.manager.CommonManager;
import com.fzzy.security.manager.SecManager;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import lombok.extern.slf4j.Slf4j;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
@@ -242,4 +241,25 @@
        return prefix + "/quantity";
    }



    /*------------------巡更轨迹页面------------------*/
    /**
     * èŽ·å–巡更记录页面
     *
     * @param patrolId
     * @param view
     * @return
     */
    @RequestMapping("/patrol-record")
    public String getPatrolRecordById(@RequestParam(value = "patrolId", required = true) String patrolId,
                                      ModelMap view) {
        IgdsBaseParam param = new IgdsBaseParam();
        param.setKey(patrolId);
        List<PatrolRecord> trackPoints = secManager.getRecordByPatrolId(patrolId);
        view.put("patrolRecordList", trackPoints);

        return prefix + "/patrol-record";
    }

}

 fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java

ÎļþÃû´Ó fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SnapRecordController.java ÐÞ¸Ä
@@ -1,13 +1,12 @@
package com.fzzy.sys.controller.security;
package com.fzzy.security;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.igds.constant.RespCodeEnum;
import com.fzzy.igds.constant.WarnType;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.data.PageResponse;
import com.fzzy.igds.domain.SnapRecord;
import com.fzzy.sys.manager.common.CommonManager;
import com.fzzy.sys.manager.security.SnapRecordManager;
import com.fzzy.common.manager.CommonManager;
import com.fzzy.security.manager.SnapRecordManager;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -17,10 +16,6 @@
import org.springframework.web.bind.annotation.ResponseBody;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;


@Slf4j

 fzzy-igdss-web/src/main/java/com/fzzy/security/manager/EventInfoManager.java

ÎļþÃû´Ó fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/EventInfoManager.java ÐÞ¸Ä
@@ -1,12 +1,11 @@
package com.fzzy.sys.manager.security;
package com.fzzy.security.manager;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.EventInfo;
import com.fzzy.igds.domain.SnapRecord;
import com.fzzy.igds.service.EventInfoService;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.sys.manager.common.CommonManager;
import com.fzzy.common.manager.CommonManager;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

 fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SecManager.java

ÎļþÃû´Ó fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/SecManager.java ÐÞ¸Ä
@@ -1,5 +1,6 @@
package com.fzzy.sys.manager.security;
package com.fzzy.security.manager;

import com.fzzy.common.manager.CommonManager;
import com.fzzy.igds.camera.ApiCameraManager;
import com.fzzy.igds.camera.data.ApiCameraData;
import com.fzzy.igds.camera.data.ApiCameraResp;
@@ -9,6 +10,7 @@
import com.fzzy.igds.domain.Camera;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.domain.Patrol;
import com.fzzy.igds.domain.PatrolRecord;
import com.fzzy.igds.service.CoreDeptService;
import com.fzzy.igds.service.PatrolService;
import com.fzzy.igds.service.SecCameraService;
@@ -40,6 +42,8 @@
    private PatrolService patrolService;
    @Resource
    private CoreDeptService coreDeptService;
    @Resource
    private CommonManager commonManager;

    /**
     *
@@ -206,4 +210,24 @@

        return patrolSuperData;
    }

    /**
     * æ ¹æ®ID获取点位信息
     *
     * @param patrolId
     * @return
     */
    public List<PatrolRecord> getRecordByPatrolId(String patrolId) {

        List<PatrolRecord> patrolRecords = patrolService.getRecordByPatrolId(patrolId);

        if(null != patrolRecords && !patrolRecords.isEmpty()){
            //判断文件是否存在
            for (PatrolRecord record : patrolRecords) {
                record.setImgName(commonManager.isImgExit( record.getImgName(), null));
            }
        }

        return patrolRecords;
    }
}

 fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SnapRecordManager.java

ÎļþÃû´Ó fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/SnapRecordManager.java ÐÞ¸Ä
@@ -1,11 +1,11 @@
package com.fzzy.sys.manager.security;
package com.fzzy.security.manager;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.SnapRecord;
import com.fzzy.igds.service.SnapRecordService;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.sys.manager.common.CommonManager;
import com.fzzy.common.manager.CommonManager;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

 fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolConfController.java

ÎļþÒÑɾ³ý

 fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolController.java

ÎļþÒÑɾ³ý

 fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolRecordController.java

ÎļþÒÑɾ³ý

 fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/PatrolConfManager.java

ÎļþÒÑɾ³ý

 fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/PatrolManager.java

ÎļþÒÑɾ³ý

 fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/PatrolRecordManager.java

ÎļþÒÑɾ³ý

 fzzy-igdss-web/src/main/resources/static/security/patrol-record-style.css

 fzzy-igdss-web/src/main/resources/static/security/patrol-record.js

 fzzy-igdss-web/src/main/resources/templates/security/patrol-record.html

ÎļþÃû´Ó fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolRecord/patrolRecord.html ÐÞ¸Ä
@@ -6,7 +6,7 @@
    <!-- Layui CSS（用于基础样式） -->
    <th:block th:include="include :: header('巡更记录')"/>
    <link rel="stylesheet" type="text/css" th:href="@{/ajax/libs/layui-ruoyi/css/layui.css}"/>
    <link rel="stylesheet" th:href="@{/security/patrol/patrolRecord-style.css}">
    <link rel="stylesheet" th:href="@{/security/patrol-record-style.css}">
    <script type="text/javascript" src="https://api.map.baidu.com/api?v=1.0&type=webgl&ak=R3FfyIEbBAWNckTqRSopHQktdkgp924F"></script>
</head>
<body>
@@ -43,7 +43,7 @@
<!-- å¼•å…¥Layui JS -->
<th:block th:include="include :: footer"/>
<script th:src="@{/ajax/libs/layui-ruoyi/layui.js}"></script>
<script th:src="@{/security/patrol/patrolRecord.js}"></script>
<script th:src="@{/security/patrol-record.js}"></script>
<script  th:inline="javascript">
    var patrolRecordList = [[${patrolRecordList}]];
</script>

 fzzy-igdss-web/src/main/resources/templates/security/patrol/add.html

ÎļþÒÑɾ³ý

 fzzy-igdss-web/src/main/resources/templates/security/patrol/edit.html

ÎļþÒÑɾ³ý

 fzzy-igdss-web/src/main/resources/templates/security/patrol/patrol.html

ÎļþÒÑɾ³ý

 fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/add.html

ÎļþÒÑɾ³ý

 fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/edit.html

ÎļþÒÑɾ³ý

 fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolConf/patrolConf.html

ÎļþÒÑɾ³ý

 fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolRecord/trajectoryMap.html

ÎļþÒÑɾ³ý