diff --git a/bin/clean.bat b/bin/clean.bat deleted file mode 100644 index 24c0974..0000000 --- a/bin/clean.bat +++ /dev/null @@ -1,12 +0,0 @@ -@echo off -echo. -echo [信息] 清理工程target生成路径。 -echo. - -%~d0 -cd %~dp0 - -cd .. -call mvn clean - -pause \ No newline at end of file diff --git a/bin/package.bat b/bin/package.bat deleted file mode 100644 index c693ec0..0000000 --- a/bin/package.bat +++ /dev/null @@ -1,12 +0,0 @@ -@echo off -echo. -echo [信息] 打包Web工程,生成war/jar包文件。 -echo. - -%~d0 -cd %~dp0 - -cd .. -call mvn clean package -Dmaven.test.skip=true - -pause \ No newline at end of file diff --git a/bin/run.bat b/bin/run.bat deleted file mode 100644 index 41efbd0..0000000 --- a/bin/run.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [信息] 使用Jar命令运行Web工程。 -echo. - -cd %~dp0 -cd ../ruoyi-admin/target - -set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -jar %JAVA_OPTS% ruoyi-admin.jar - -cd bin -pause \ No newline at end of file diff --git a/doc/鑻ヤ緷鐜浣跨敤鎵嬪唽.docx b/doc/鑻ヤ緷鐜浣跨敤鎵嬪唽.docx deleted file mode 100644 index 9e4daef..0000000 --- a/doc/鑻ヤ緷鐜浣跨敤鎵嬪唽.docx +++ /dev/null @@ -1,103 +0,0 @@ - 鑻ヤ緷绯荤粺寮鍙戠幆澧冩惌寤烘墜鍐 -1. 鍑嗗宸ヤ綔 -1.1 鍓嶇疆鐜鍑嗗 -- -- 瀹夎Maven - 鑻ヤ緷鍩轰簬Maven绠$悊椤圭洰鐨勬瀯寤猴紝闇瑕佸厛瀹夎濂界浉搴旂殑鐗堟湰銆 -1.2 寮鍙戝伐鍏 - 鑻ヤ緷绯荤粺閲囩敤Eclipse浣滀负寮鍙戝伐鍏枫備絾涓嶅眬闄愪簬Eclipse銆傛澶勪粎浠嬬粛鍦‥clipse鎼缓寮鍙戠幆澧冩墍闇鐨勬搷浣溿 -2. 寮鍙戠幆澧冩惌寤 -2.1 寮鍙戝伐鍏风殑閰嶇疆 -2.1.1 閰嶇疆Maven -杩涘叆Window->Preferences->Maven->Installations椤甸潰锛岃缃凡缁忓畨瑁呭ソ鐨凪aven - -2.1.2 閰嶇疆Maven浠撳簱璺緞 -杩涘叆Window->Preferences->Maven->User Settings椤甸潰锛岄厤缃粨搴撹矾寰 - -2.1.4 鍏抽棴鏍¢獙 -杩涘叆Window->Preferences->Validation椤甸潰锛屽嬀閫"Suspend all validators"锛屽叧闂牎楠 - -2.2 瀵煎叆宸ョ▼ -閫氳繃Eclipse瀵煎叆宸ョ▼锛屾楠ゅ涓嬶細 -(1)鐐瑰嚮宸︿晶椤圭洰鍖哄煙 -- >Import... - -(2)閫夋嫨RuoYi - -(3)鐐瑰嚮Finish - -(4)RuoYi鐨勪唬鐮佸氨琚鍑哄埌Eclipse涓簡锛屾鏃跺彲浠ュ湪宸ョ▼瑙嗗浘涓湅鍒般 - -3. 杩愯鑻ヤ緷绯荤粺 -3.1 蹇呰鐨勯厤缃 -3.1.1 淇敼鏁版嵁搴撹繛鎺 -缂栬緫src/main/ resources鐩綍涓嬬殑application-druid.yml 鏂囦欢锛屼慨鏀规暟鎹簱鍦板潃璐﹀彿淇℃伅銆 -鎵цsql/ ry_20180423.sql锛宷uartz.sql 涓や釜鏂囦欢 鏃ユ湡闅忕増鏈彉鍖 -3.1.2 寮鍙戠幆澧冮厤缃 -缂栬緫src/main/ resources鐩綍涓嬬殑application.yml 鏂囦欢锛 -榛樿绔彛涓80 - -3.1.3 浠g爜鐢熸垚閰嶇疆 -缂栬緫src/main/ resources鐩綍涓嬬殑application.yml 鏂囦欢锛 - -榛樿涓簃odule锛屾牴鎹疄闄呮儏鍐典慨鏀瑰嵆鍙傜敓鎴愮殑琛ㄨ鏈夋敞閲 - -娉細濡傚妯℃澘鏈夌壒娈婇渶姹傦紝鍙嚜琛屼慨鏀广傜紪杈憇rc/main/ resources/templates/vm鐩綍涓 - - -3.1.4 鏃ュ織閰嶇疆 -缂栬緫src/main/ resources鐩綍涓嬬殑logback.yml 鏂囦欢 - -鏀逛负鑷繁闇瑕佺殑璺緞 - -3.2 鍚姩鍙婇獙璇侊紙鍚庡彴锛 -鍚姩RuoYiApplication.java 鍑虹幇濡備笅鍥捐〃绀哄惎鍔ㄦ垚鍔 - -鎵撳紑娴忚鍣紝杈撳叆锛歨ttp://localhost:8080/captchaImage -鑻ヨ兘姝g‘鏄剧ず杩斿洖淇℃伅锛屾惌寤哄悗鍙版垚鍔熴 - -3.3 鍚姩鍙婇獙璇侊紙鍓嶅彴锛 -# 杩涘叆椤圭洰鐩綍 -cd ruoyi-ui - -npm install --registry=https://registry.npm.taobao.org - -npm run dev - -鎵撳紑娴忚鍣紝杈撳叆锛歨ttp://localhost:80 锛堥粯璁よ处鎴 admin/admin123锛 -鑻ヨ兘姝g‘灞曠ず鐧诲綍椤甸潰锛屽苟鑳芥垚鍔熺櫥褰曪紝鑿滃崟鍙婇〉闈㈠睍绀烘甯革紝鍒欒〃鏄庣幆澧冩惌寤烘垚鍔 -娉ㄦ剰锛氭墽琛宯pm鍛戒护闇瑕侀厤缃畁ode鐜 -4. 閮ㄧ讲鑻ヤ緷绯荤粺 -4.1 war閮ㄧ讲鏂瑰紡 -4.1.1 淇敼pom.xml鏂囦欢銆傚皢jar淇敼涓簑ar - -濡傛灉鏄垎妯″潡闇瑕佷慨鏀箁uoyi-admin - - -4.1.2 鍦╯pring-boot-starter渚濊禆涓Щ闄omcat妯″潡 - - - - spring-boot-starter-tomcat - org.springframework.boot - - - -4.1.3 閮ㄧ讲鍒皌omcat鐨剋ebapps鐩綍涓嬮潰 -榛樿涓篟uoYi.war - -4.1.4 鍚姩鍙婇獙璇 -杩愯startup.bat 鍑虹幇濡備笅鍥惧嵆閮ㄧ讲鎴愬姛 - -4.2 Jar鏂瑰紡閮ㄧ讲 -鎵ц鍛戒护锛歫ava - jar RuoYi.jar -鑴氭湰鎵ц锛歳y.sh start 鍚姩stop 鍋滄 - -4.2 鍓嶇閮ㄧ讲 -# 鎵撳寘姝e紡鐜 -npm run build:prod - -# 鎵撳寘棰勫彂甯冪幆澧 -npm run build:stage - -鏋勫缓鎵撳寘鎴愬姛涔嬪悗锛屼細鍦ㄦ牴鐩綍鐢熸垚 dist 鏂囦欢澶癸紝閲岄潰灏辨槸鏋勫缓鎵撳寘濂界殑鏂囦欢锛岄氬父鏄 ***.js 銆***.css銆乮ndex.html 绛夐潤鎬佹枃浠躲傚彂甯冨埌浣犵殑 nginx 鎴栬呴潤鎬佹湇鍔″櫒鍗冲彲锛屽叾涓殑 index.html 鏄悗鍙版湇鍔$殑鍏ュ彛椤甸潰銆 - -婕旂ず鍦板潃锛歳uoyi.vip -鏂囨。鍦板潃锛歞oc.ruoyi.vip diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/common/entity/BaseInfoEntity.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/common/entity/BaseInfoEntity.java new file mode 100644 index 0000000..3dde8cb --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/common/entity/BaseInfoEntity.java @@ -0,0 +1,52 @@ +package com.ruoyi.jjh.common.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * Entity鍩虹被 + * + * @author ruoyi + */ +@Data +public class BaseInfoEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 鍒涘缓鑰 + */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 鍒涘缓鏃堕棿 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 鏇存柊鑰 + */ + @TableField(fill = FieldFill.UPDATE) + private String updateBy; + + /** + * 鏇存柊鏃堕棿 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField(fill = FieldFill.UPDATE) + private Date updateTime; + + /** + * 澶囨敞 + */ + private String remark; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsApprovalInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsApprovalInfoController.java new file mode 100644 index 0000000..64867d9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsApprovalInfoController.java @@ -0,0 +1,97 @@ +package com.ruoyi.jjh.declaration.controller; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.BmsApprovalInfo; +import com.ruoyi.jjh.declaration.service.IBmsApprovalInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 瀹℃壒璁板綍淇℃伅Controller + * + * @author farben + * @date 2023-09-09 + */ +@RestController +@RequestMapping("/approvalInfo") +public class BmsApprovalInfoController extends BaseController { + @Autowired + private IBmsApprovalInfoService bmsApprovalInfoService; + + /** + * 鏌ヨ瀹℃壒璁板綍淇℃伅鍒楄〃 + */ +// @RequiresPermissions("system:approvalInfo:list") + @GetMapping("/list") + public TableDataInfo list(BmsApprovalInfo bmsApprovalInfo) { + startPage(); + List list = bmsApprovalInfoService.selectBmsApprovalInfoList(bmsApprovalInfo); + return getDataTable(list); + } + + /** + * 瀵煎嚭瀹℃壒璁板綍淇℃伅鍒楄〃 + */ +// @RequiresPermissions("system:approvalInfo:export") + @Log(title = "瀹℃壒璁板綍淇℃伅", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BmsApprovalInfo bmsApprovalInfo) { + List list = bmsApprovalInfoService.selectBmsApprovalInfoList(bmsApprovalInfo); + ExcelUtil util = new ExcelUtil(BmsApprovalInfo.class); + util.exportExcel(response, list, "瀹℃壒璁板綍淇℃伅鏁版嵁"); + } + + /** + * 鑾峰彇瀹℃壒璁板綍淇℃伅璇︾粏淇℃伅 + */ +// @RequiresPermissions("system:approvalInfo:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(bmsApprovalInfoService.selectBmsApprovalInfoById(id)); + } + + /** + * 鏂板瀹℃壒璁板綍淇℃伅 + */ +// @RequiresPermissions("system:approvalInfo:add") + @Log(title = "瀹℃壒璁板綍淇℃伅", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BmsApprovalInfo bmsApprovalInfo) { + return toAjax(bmsApprovalInfoService.insertBmsApprovalInfo(bmsApprovalInfo)); + } + + /** + * 淇敼瀹℃壒璁板綍淇℃伅 + */ +// @RequiresPermissions("system:approvalInfo:edit") + @Log(title = "瀹℃壒璁板綍淇℃伅", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BmsApprovalInfo bmsApprovalInfo) { + return toAjax(bmsApprovalInfoService.updateBmsApprovalInfo(bmsApprovalInfo)); + } + + /** + * 鍒犻櫎瀹℃壒璁板綍淇℃伅 + */ +// @RequiresPermissions("system:approvalInfo:remove") + @Log(title = "瀹℃壒璁板綍淇℃伅", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(bmsApprovalInfoService.deleteBmsApprovalInfoByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsBigStrongAwardController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsBigStrongAwardController.java new file mode 100644 index 0000000..170f57f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsBigStrongAwardController.java @@ -0,0 +1,99 @@ +package com.ruoyi.jjh.declaration.controller; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.BmsBigStrongAward; +import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardUpdateDto; +import com.ruoyi.jjh.declaration.service.IBmsBigStrongAwardService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 鍋氬ぇ鍋氬己濂栬鎯匔ontroller + * + * @author farben + * @date 2023-08-25 + */ +@RestController +@RequestMapping("/bigStrongAward") +public class BmsBigStrongAwardController extends BaseController { + @Autowired + private IBmsBigStrongAwardService bmsBigStrongAwardService; + + /** + * 鏌ヨ鍋氬ぇ鍋氬己濂栬鎯呭垪琛 + */ +// @RequiresPermissions("system:bigStrongAward:list") + @GetMapping("/list") + public TableDataInfo list(BmsBigStrongAward bmsBigStrongAward) { + startPage(); + List list = bmsBigStrongAwardService.selectBmsBigStrongAwardList(bmsBigStrongAward); + return getDataTable(list); + } + + /** + * 瀵煎嚭鍋氬ぇ鍋氬己濂栬鎯呭垪琛 + */ +// @RequiresPermissions("system:bigStrongAward:export") + @Log(title = "鍋氬ぇ鍋氬己濂栬鎯", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BmsBigStrongAward bmsBigStrongAward) { + List list = bmsBigStrongAwardService.selectBmsBigStrongAwardList(bmsBigStrongAward); + ExcelUtil util = new ExcelUtil(BmsBigStrongAward.class); + util.exportExcel(response, list, "鍋氬ぇ鍋氬己濂栬鎯呮暟鎹"); + } + + /** + * 鑾峰彇鍋氬ぇ鍋氬己濂栬鎯呰缁嗕俊鎭 + */ +// @RequiresPermissions("system:bigStrongAward:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(bmsBigStrongAwardService.selectBmsBigStrongAwardById(id)); + } + + /** + * 鏂板鍋氬ぇ鍋氬己濂栬鎯 + */ +// @RequiresPermissions("system:bigStrongAward:add") + @Log(title = "鍋氬ぇ鍋氬己濂栬鎯", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BmsBigStrongAwardAddDto bmsBigStrongAwardAddDto) { + return toAjax(bmsBigStrongAwardService.insertBmsBigStrongAward(bmsBigStrongAwardAddDto)); + } + + /** + * 淇敼鍋氬ぇ鍋氬己濂栬鎯 + */ +// @RequiresPermissions("system:bigStrongAward:edit") + @Log(title = "鍋氬ぇ鍋氬己濂栬鎯", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BmsBigStrongAwardUpdateDto bmsBigStrongAwardUpdateDto) { + return toAjax(bmsBigStrongAwardService.updateBmsBigStrongAward(bmsBigStrongAwardUpdateDto)); + } + + /** + * 鍒犻櫎鍋氬ぇ鍋氬己濂栬鎯 + */ +// @RequiresPermissions("system:bigStrongAward:remove") + @Log(title = "鍋氬ぇ鍋氬己濂栬鎯", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(bmsBigStrongAwardService.deleteBmsBigStrongAwardByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsBrandingAwardController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsBrandingAwardController.java new file mode 100644 index 0000000..8169e70 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsBrandingAwardController.java @@ -0,0 +1,99 @@ +package com.ruoyi.jjh.declaration.controller; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.BmsBrandingAward; +import com.ruoyi.jjh.declaration.entity.dto.BmsBrandingAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsBrandingAwardUpdateDto; +import com.ruoyi.jjh.declaration.service.IBmsBrandingAwardService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 鍝佺墝鎵撻犲琛ontroller + * + * @author farben + * @date 2023-08-25 + */ +@RestController +@RequestMapping("/brandingAward") +public class BmsBrandingAwardController extends BaseController { + @Autowired + private IBmsBrandingAwardService bmsBrandingAwardService; + + /** + * 鏌ヨ鍝佺墝鎵撻犲琛ュ垪琛 + */ +// @RequiresPermissions("system:brandingAward:list") + @GetMapping("/list") + public TableDataInfo list(BmsBrandingAward bmsBrandingAward) { + startPage(); + List list = bmsBrandingAwardService.selectBmsBrandingAwardList(bmsBrandingAward); + return getDataTable(list); + } + + /** + * 瀵煎嚭鍝佺墝鎵撻犲琛ュ垪琛 + */ +// @RequiresPermissions("system:brandingAward:export") + @Log(title = "鍝佺墝鎵撻犲琛", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BmsBrandingAward bmsBrandingAward) { + List list = bmsBrandingAwardService.selectBmsBrandingAwardList(bmsBrandingAward); + ExcelUtil util = new ExcelUtil(BmsBrandingAward.class); + util.exportExcel(response, list, "鍝佺墝鎵撻犲琛ユ暟鎹"); + } + + /** + * 鑾峰彇鍝佺墝鎵撻犲琛ヨ缁嗕俊鎭 + */ +// @RequiresPermissions("system:brandingAward:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(bmsBrandingAwardService.selectBmsBrandingAwardById(id)); + } + + /** + * 鏂板鍝佺墝鎵撻犲琛 + */ +// @RequiresPermissions("system:brandingAward:add") + @Log(title = "鍝佺墝鎵撻犲琛", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BmsBrandingAwardAddDto bmsBrandingAwardAddDto) { + return toAjax(bmsBrandingAwardService.insertBmsBrandingAward(bmsBrandingAwardAddDto)); + } + + /** + * 淇敼鍝佺墝鎵撻犲琛 + */ +// @RequiresPermissions("system:brandingAward:edit") + @Log(title = "鍝佺墝鎵撻犲琛", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BmsBrandingAwardUpdateDto bmsBrandingAwardUpdateDto) { + return toAjax(bmsBrandingAwardService.updateBmsBrandingAward(bmsBrandingAwardUpdateDto)); + } + + /** + * 鍒犻櫎鍝佺墝鎵撻犲琛 + */ +// @RequiresPermissions("system:brandingAward:remove") + @Log(title = "鍝佺墝鎵撻犲琛", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(bmsBrandingAwardService.deleteBmsBrandingAwardByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsCarrierConstructionAwardController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsCarrierConstructionAwardController.java new file mode 100644 index 0000000..f87c700 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsCarrierConstructionAwardController.java @@ -0,0 +1,99 @@ +package com.ruoyi.jjh.declaration.controller; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.BmsCarrierConstructionAward; +import com.ruoyi.jjh.declaration.entity.dto.BmsCarrierConstructionAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsCarrierConstructionAwardUpdateDto; +import com.ruoyi.jjh.declaration.service.IBmsCarrierConstructionAwardService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 杞戒綋寤鸿濂栬ˉController + * + * @author farben + * @date 2023-08-25 + */ +@RestController +@RequestMapping("/carrierConstructionAward") +public class BmsCarrierConstructionAwardController extends BaseController { + @Autowired + private IBmsCarrierConstructionAwardService bmsCarrierConstructionAwardService; + + /** + * 鏌ヨ杞戒綋寤鸿濂栬ˉ鍒楄〃 + */ +// @RequiresPermissions("system:carrierConstructionAward:list") + @GetMapping("/list") + public TableDataInfo list(BmsCarrierConstructionAward bmsCarrierConstructionAward) { + startPage(); + List list = bmsCarrierConstructionAwardService.selectBmsCarrierConstructionAwardList(bmsCarrierConstructionAward); + return getDataTable(list); + } + + /** + * 瀵煎嚭杞戒綋寤鸿濂栬ˉ鍒楄〃 + */ +// @RequiresPermissions("system:carrierConstructionAward:export") + @Log(title = "杞戒綋寤鸿濂栬ˉ", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BmsCarrierConstructionAward bmsCarrierConstructionAward) { + List list = bmsCarrierConstructionAwardService.selectBmsCarrierConstructionAwardList(bmsCarrierConstructionAward); + ExcelUtil util = new ExcelUtil(BmsCarrierConstructionAward.class); + util.exportExcel(response, list, "杞戒綋寤鸿濂栬ˉ鏁版嵁"); + } + + /** + * 鑾峰彇杞戒綋寤鸿濂栬ˉ璇︾粏淇℃伅 + */ +// @RequiresPermissions("system:carrierConstructionAward:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(bmsCarrierConstructionAwardService.selectBmsCarrierConstructionAwardById(id)); + } + + /** + * 鏂板杞戒綋寤鸿濂栬ˉ + */ +// @RequiresPermissions("system:carrierConstructionAward:add") + @Log(title = "杞戒綋寤鸿濂栬ˉ", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BmsCarrierConstructionAwardAddDto bmsCarrierConstructionAwardAddDto) { + return toAjax(bmsCarrierConstructionAwardService.insertBmsCarrierConstructionAward(bmsCarrierConstructionAwardAddDto)); + } + + /** + * 淇敼杞戒綋寤鸿濂栬ˉ + */ +// @RequiresPermissions("system:carrierConstructionAward:edit") + @Log(title = "杞戒綋寤鸿濂栬ˉ", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BmsCarrierConstructionAwardUpdateDto bmsCarrierConstructionAwardUpdateDto) { + return toAjax(bmsCarrierConstructionAwardService.updateBmsCarrierConstructionAward(bmsCarrierConstructionAwardUpdateDto)); + } + + /** + * 鍒犻櫎杞戒綋寤鸿濂栬ˉ + */ +// @RequiresPermissions("system:carrierConstructionAward:remove") + @Log(title = "杞戒綋寤鸿濂栬ˉ", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(bmsCarrierConstructionAwardService.deleteBmsCarrierConstructionAwardByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsCreditManagementController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsCreditManagementController.java new file mode 100644 index 0000000..11c6608 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsCreditManagementController.java @@ -0,0 +1,99 @@ +package com.ruoyi.jjh.declaration.controller; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.BmsCreditManagement; +import com.ruoyi.jjh.declaration.entity.dto.BmsCreditManagementAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsCreditManagementUpdateDto; +import com.ruoyi.jjh.declaration.service.IBmsCreditManagementService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 淇$敤绠$悊濂栬ˉController + * + * @author farben + * @date 2023-09-04 + */ +@RestController +@RequestMapping("/creditManagement") +public class BmsCreditManagementController extends BaseController { + @Autowired + private IBmsCreditManagementService bmsCreditManagementService; + + /** + * 鏌ヨ淇$敤绠$悊濂栬ˉ鍒楄〃 + */ +// @RequiresPermissions("system:creditManagement:list") + @GetMapping("/list") + public TableDataInfo list(BmsCreditManagement bmsCreditManagement) { + startPage(); + List list = bmsCreditManagementService.selectBmsCreditManagementList(bmsCreditManagement); + return getDataTable(list); + } + + /** + * 瀵煎嚭淇$敤绠$悊濂栬ˉ鍒楄〃 + */ +// @RequiresPermissions("system:creditManagement:export") + @Log(title = "淇$敤绠$悊濂栬ˉ", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BmsCreditManagement bmsCreditManagement) { + List list = bmsCreditManagementService.selectBmsCreditManagementList(bmsCreditManagement); + ExcelUtil util = new ExcelUtil(BmsCreditManagement.class); + util.exportExcel(response, list, "淇$敤绠$悊濂栬ˉ鏁版嵁"); + } + + /** + * 鑾峰彇淇$敤绠$悊濂栬ˉ璇︾粏淇℃伅 + */ +// @RequiresPermissions("system:creditManagement:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(bmsCreditManagementService.selectBmsCreditManagementById(id)); + } + + /** + * 鏂板淇$敤绠$悊濂栬ˉ + */ +// @RequiresPermissions("system:creditManagement:add") + @Log(title = "淇$敤绠$悊濂栬ˉ", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BmsCreditManagementAddDto bmsCreditManagementAddDto) { + return toAjax(bmsCreditManagementService.insertBmsCreditManagement(bmsCreditManagementAddDto)); + } + + /** + * 淇敼淇$敤绠$悊濂栬ˉ + */ +// @RequiresPermissions("system:creditManagement:edit") + @Log(title = "淇$敤绠$悊濂栬ˉ", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BmsCreditManagementUpdateDto bmsCreditManagementUpdateDto) { + return toAjax(bmsCreditManagementService.updateBmsCreditManagement(bmsCreditManagementUpdateDto)); + } + + /** + * 鍒犻櫎淇$敤绠$悊濂栬ˉ + */ +// @RequiresPermissions("system:creditManagement:remove") + @Log(title = "淇$敤绠$悊濂栬ˉ", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(bmsCreditManagementService.deleteBmsCreditManagementByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsDeclarationRecordsController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsDeclarationRecordsController.java new file mode 100644 index 0000000..1ccbc1d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsDeclarationRecordsController.java @@ -0,0 +1,160 @@ +package com.ruoyi.jjh.declaration.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; +import com.ruoyi.jjh.declaration.entity.dto.ApprovalDeclarationRecordsQueryDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsApprovalInfoUpdateDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsDeclarationRecordsAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsDeclarationRecordsDto; +import com.ruoyi.jjh.declaration.entity.dto.MunicipalReviewDto; +import com.ruoyi.jjh.declaration.entity.vo.ApprovalDeclarationRecordsQueryVo; +import com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo; +import com.ruoyi.jjh.declaration.entity.vo.BmsMunicipalBureauReviewQueryVo; +import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 鍦ㄧ嚎鐢虫姤璁板綍Controller + * + * @author farben + * @date 2023-08-28 + */ +@RestController +@RequestMapping("/declarationRecords") +public class BmsDeclarationRecordsController extends BaseController { + @Autowired + private IBmsDeclarationRecordsService bmsDeclarationRecordsService; + + + /** + * 瀹℃牳鍒楄〃 + * + * @param approvalDeclarationRecordsQueryDto + * @return {@link TableDataInfo} + * @author emiya.xie + * @create 2023/9/9 14:41 + */ + @GetMapping("/approvalList") + public TableDataInfo approvalList(ApprovalDeclarationRecordsQueryDto approvalDeclarationRecordsQueryDto) { + startPage(); + List list = bmsDeclarationRecordsService.approvalList(approvalDeclarationRecordsQueryDto); + return getDataTable(list); + } + + @Log(title = "瀹℃壒璁板綍淇℃伅", businessType = BusinessType.UPDATE) + @PutMapping("/approvalEdit") + public AjaxResult approvalEdit(@RequestBody BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto) { + return toAjax(bmsDeclarationRecordsService.updateApprovalInfo(bmsApprovalInfoUpdateDto)); + } + + /** + * 鏌ヨ鍦ㄧ嚎鐢虫姤璁板綍鍒楄〃 + */ +// @RequiresPermissions("system:declarationRecords:list") + @GetMapping("/list") + public TableDataInfo list(BmsDeclarationRecordsDto bmsDeclarationRecordsDto) { + startPage(); + List list = bmsDeclarationRecordsService.selectBmsDeclarationRecordsList(bmsDeclarationRecordsDto); + return getDataTable(list); + } + + /** + * 鏌ヨ鍦ㄧ嚎鐢虫姤璁板綍鍒楄〃-鏀垮姟 + */ + @GetMapping("/listRecords") + public TableDataInfo listRecords(BmsDeclarationRecordsDto bmsDeclarationRecordsDto) { + startPage(); + List list = bmsDeclarationRecordsService.selectBmsDeclarationRecordsZwList(bmsDeclarationRecordsDto); + return getDataTable(list); + } + + @Log(title = "涓嬭浇甯傚眬瀹℃牳鐢虫姤璁板綍", businessType = BusinessType.EXPORT) + @PostMapping("/exportMunicipalBureauReview") + public void export(HttpServletResponse response) { + List list = bmsDeclarationRecordsService.selectMunicipalBureauReviewList(); + ExcelUtil util = new ExcelUtil(BmsMunicipalBureauReviewQueryVo.class); + util.exportExcel(response, list, "鍦ㄧ嚎鐢虫姤璁板綍鏁版嵁"); + } + + + /** + * 瀵煎嚭鍦ㄧ嚎鐢虫姤璁板綍鍒楄〃 + */ +// @RequiresPermissions("system:declarationRecords:export") + @Log(title = "鍦ㄧ嚎鐢虫姤璁板綍", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BmsDeclarationRecordsDto bmsDeclarationRecordsDto) { + List list = bmsDeclarationRecordsService.selectBmsDeclarationRecordsList(bmsDeclarationRecordsDto); + ExcelUtil util = new ExcelUtil(BmsDeclarationRecordsQueryVo.class); + util.exportExcel(response, list, "鍦ㄧ嚎鐢虫姤璁板綍鏁版嵁"); + } + + /** + * 鑾峰彇鍦ㄧ嚎鐢虫姤璁板綍璇︾粏淇℃伅 + */ +// @RequiresPermissions("system:declarationRecords:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(bmsDeclarationRecordsService.selectBmsDeclarationRecordsById(id)); + } + + /** + * 鏂板鍦ㄧ嚎鐢虫姤璁板綍 + */ +// @RequiresPermissions("system:declarationRecords:add") + @Log(title = "鍦ㄧ嚎鐢虫姤璁板綍", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BmsDeclarationRecordsAddDto bmsDeclarationRecordsAddDto) { + return toAjax(bmsDeclarationRecordsService.insertBmsDeclarationRecords(bmsDeclarationRecordsAddDto)); + } + + /** + * 淇敼鍦ㄧ嚎鐢虫姤璁板綍 + */ +// @RequiresPermissions("system:declarationRecords:edit") + @Log(title = "鍦ㄧ嚎鐢虫姤璁板綍", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BmsDeclarationRecords bmsDeclarationRecords) { + return toAjax(bmsDeclarationRecordsService.updateBmsDeclarationRecords(bmsDeclarationRecords)); + } + + @Log(title = "甯傜骇璇勫畾缁撴灉纭-old", businessType = BusinessType.UPDATE) + @PutMapping("/municipalReview") + @Deprecated + public AjaxResult municipalReview(@RequestBody MunicipalReviewDto municipalReviewDto) { + return success("甯傜骇璇勫畾缁撴灉纭鎴愬姛" + bmsDeclarationRecordsService.municipalReview(municipalReviewDto) + "鏉℃暟鎹"); + } + + @Log(title = "甯傜骇璇勫畾缁撴灉纭-new", businessType = BusinessType.UPDATE) + @PutMapping("/municipalReviewNew") + public AjaxResult municipalReviewNew(@RequestBody MunicipalReviewDto municipalReviewDto) { + return success("甯傜骇璇勫畾缁撴灉纭鎴愬姛" + bmsDeclarationRecordsService.municipalReviewNew(municipalReviewDto) + "鏉℃暟鎹"); + } + + + /** + * 鍒犻櫎鍦ㄧ嚎鐢虫姤璁板綍 + */ +// @RequiresPermissions("system:declarationRecords:remove") + @Log(title = "鍦ㄧ嚎鐢虫姤璁板綍", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(bmsDeclarationRecordsService.deleteBmsDeclarationRecordsByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseBasicInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseBasicInfoController.java new file mode 100644 index 0000000..34012f7 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseBasicInfoController.java @@ -0,0 +1,98 @@ +package com.ruoyi.jjh.declaration.controller; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; +import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 浼佷笟鍩虹淇℃伅Controller + * + * @author farben + * @date 2023-08-25 + */ +@RestController +@RequestMapping("/enterpriseBasicInfo") +public class BmsEnterpriseBasicInfoController extends BaseController { + + @Autowired + private IBmsEnterpriseBasicInfoService bmsEnterpriseBasicInfoService; + + /** + * 鏌ヨ浼佷笟鍩虹淇℃伅鍒楄〃 + */ +// @RequiresPermissions("system:enterpriseBasicInfo:list") + @GetMapping("/list") + public TableDataInfo list(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) { + startPage(); + List list = bmsEnterpriseBasicInfoService.selectBmsEnterpriseBasicInfoList(bmsEnterpriseBasicInfo); + return getDataTable(list); + } + + /** + * 瀵煎嚭浼佷笟鍩虹淇℃伅鍒楄〃 + */ +// @RequiresPermissions("system:enterpriseBasicInfo:export") + @Log(title = "浼佷笟鍩虹淇℃伅", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) { + List list = bmsEnterpriseBasicInfoService.selectBmsEnterpriseBasicInfoList(bmsEnterpriseBasicInfo); + ExcelUtil util = new ExcelUtil(BmsEnterpriseBasicInfo.class); + util.exportExcel(response, list, "浼佷笟鍩虹淇℃伅鏁版嵁"); + } + + /** + * 鑾峰彇浼佷笟鍩虹淇℃伅璇︾粏淇℃伅 + */ +// @RequiresPermissions("system:enterpriseBasicInfo:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(bmsEnterpriseBasicInfoService.selectBmsEnterpriseBasicInfoById(id)); + } + + /** + * 鏂板浼佷笟鍩虹淇℃伅 + */ +// @RequiresPermissions("system:enterpriseBasicInfo:add") + @Log(title = "浼佷笟鍩虹淇℃伅", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) { + return toAjax(bmsEnterpriseBasicInfoService.insertBmsEnterpriseBasicInfo(bmsEnterpriseBasicInfo)); + } + + /** + * 淇敼浼佷笟鍩虹淇℃伅 + */ +// @RequiresPermissions("system:enterpriseBasicInfo:edit") + @Log(title = "浼佷笟鍩虹淇℃伅", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) { + return toAjax(bmsEnterpriseBasicInfoService.updateBmsEnterpriseBasicInfo(bmsEnterpriseBasicInfo)); + } + + /** + * 鍒犻櫎浼佷笟鍩虹淇℃伅 + */ +// @RequiresPermissions("system:enterpriseBasicInfo:remove") + @Log(title = "浼佷笟鍩虹淇℃伅", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(bmsEnterpriseBasicInfoService.deleteBmsEnterpriseBasicInfoByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseDirectoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseDirectoryController.java new file mode 100644 index 0000000..81cb583 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseDirectoryController.java @@ -0,0 +1,97 @@ +package com.ruoyi.jjh.declaration.controller; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory; +import com.ruoyi.jjh.declaration.service.IBmsEnterpriseDirectoryService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 浼佷笟鍚嶅綍Controller + * + * @author farben + * @date 2023-08-31 + */ +@RestController +@RequestMapping("/enterpriseDirectory") +public class BmsEnterpriseDirectoryController extends BaseController { + @Autowired + private IBmsEnterpriseDirectoryService bmsEnterpriseDirectoryService; + + /** + * 鏌ヨ浼佷笟鍚嶅綍鍒楄〃 + */ +// @RequiresPermissions("system:enterpriseDirectory:list") + @GetMapping("/list") + public TableDataInfo list(BmsEnterpriseDirectory bmsEnterpriseDirectory) { + startPage(); + List list = bmsEnterpriseDirectoryService.selectBmsEnterpriseDirectoryList(bmsEnterpriseDirectory); + return getDataTable(list); + } + + /** + * 瀵煎嚭浼佷笟鍚嶅綍鍒楄〃 + */ +// @RequiresPermissions("system:enterpriseDirectory:export") + @Log(title = "浼佷笟鍚嶅綍", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BmsEnterpriseDirectory bmsEnterpriseDirectory) { + List list = bmsEnterpriseDirectoryService.selectBmsEnterpriseDirectoryList(bmsEnterpriseDirectory); + ExcelUtil util = new ExcelUtil(BmsEnterpriseDirectory.class); + util.exportExcel(response, list, "浼佷笟鍚嶅綍鏁版嵁"); + } + + /** + * 鑾峰彇浼佷笟鍚嶅綍璇︾粏淇℃伅 + */ +// @RequiresPermissions("system:enterpriseDirectory:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(bmsEnterpriseDirectoryService.selectBmsEnterpriseDirectoryById(id)); + } + + /** + * 鏂板浼佷笟鍚嶅綍 + */ +// @RequiresPermissions("system:enterpriseDirectory:add") + @Log(title = "浼佷笟鍚嶅綍", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BmsEnterpriseDirectory bmsEnterpriseDirectory) { + return toAjax(bmsEnterpriseDirectoryService.insertBmsEnterpriseDirectory(bmsEnterpriseDirectory)); + } + + /** + * 淇敼浼佷笟鍚嶅綍 + */ +// @RequiresPermissions("system:enterpriseDirectory:edit") + @Log(title = "浼佷笟鍚嶅綍", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BmsEnterpriseDirectory bmsEnterpriseDirectory) { + return toAjax(bmsEnterpriseDirectoryService.updateBmsEnterpriseDirectory(bmsEnterpriseDirectory)); + } + + /** + * 鍒犻櫎浼佷笟鍚嶅綍 + */ +// @RequiresPermissions("system:enterpriseDirectory:remove") + @Log(title = "浼佷笟鍚嶅綍", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(bmsEnterpriseDirectoryService.deleteBmsEnterpriseDirectoryByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsFieldInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsFieldInfoController.java new file mode 100644 index 0000000..575079a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsFieldInfoController.java @@ -0,0 +1,97 @@ +package com.ruoyi.jjh.declaration.controller; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.BmsFieldInfo; +import com.ruoyi.jjh.declaration.service.IBmsFieldInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 妯℃澘瀛楁濉啓璇︽儏Controller + * + * @author farben + * @date 2023-09-04 + */ +@RestController +@RequestMapping("/fieldInfo") +public class BmsFieldInfoController extends BaseController { + @Autowired + private IBmsFieldInfoService bmsFieldInfoService; + + /** + * 鏌ヨ妯℃澘瀛楁濉啓璇︽儏鍒楄〃 + */ +// @RequiresPermissions("system:fieldInfo:list") + @GetMapping("/list") + public TableDataInfo list(BmsFieldInfo bmsFieldInfo) { + startPage(); + List list = bmsFieldInfoService.selectBmsFieldInfoList(bmsFieldInfo); + return getDataTable(list); + } + + /** + * 瀵煎嚭妯℃澘瀛楁濉啓璇︽儏鍒楄〃 + */ +// @RequiresPermissions("system:fieldInfo:export") + @Log(title = "妯℃澘瀛楁濉啓璇︽儏", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BmsFieldInfo bmsFieldInfo) { + List list = bmsFieldInfoService.selectBmsFieldInfoList(bmsFieldInfo); + ExcelUtil util = new ExcelUtil(BmsFieldInfo.class); + util.exportExcel(response, list, "妯℃澘瀛楁濉啓璇︽儏鏁版嵁"); + } + + /** + * 鑾峰彇妯℃澘瀛楁濉啓璇︽儏璇︾粏淇℃伅 + */ +// @RequiresPermissions("system:fieldInfo:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(bmsFieldInfoService.selectBmsFieldInfoById(id)); + } + + /** + * 鏂板妯℃澘瀛楁濉啓璇︽儏 + */ +// @RequiresPermissions("system:fieldInfo:add") + @Log(title = "妯℃澘瀛楁濉啓璇︽儏", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BmsFieldInfo bmsFieldInfo) { + return toAjax(bmsFieldInfoService.insertBmsFieldInfo(bmsFieldInfo)); + } + + /** + * 淇敼妯℃澘瀛楁濉啓璇︽儏 + */ +// @RequiresPermissions("system:fieldInfo:edit") + @Log(title = "妯℃澘瀛楁濉啓璇︽儏", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BmsFieldInfo bmsFieldInfo) { + return toAjax(bmsFieldInfoService.updateBmsFieldInfo(bmsFieldInfo)); + } + + /** + * 鍒犻櫎妯℃澘瀛楁濉啓璇︽儏 + */ +// @RequiresPermissions("system:fieldInfo:remove") + @Log(title = "妯℃澘瀛楁濉啓璇︽儏", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(bmsFieldInfoService.deleteBmsFieldInfoByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsFileInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsFileInfoController.java new file mode 100644 index 0000000..ce9c182 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsFileInfoController.java @@ -0,0 +1,97 @@ +package com.ruoyi.jjh.declaration.controller; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.BmsFileInfo; +import com.ruoyi.jjh.declaration.service.IBmsFileInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 鏂囦欢瀛樺偍璇存槑璇︽儏Controller + * + * @author farben + * @date 2023-09-04 + */ +@RestController +@RequestMapping("/fileInfo") +public class BmsFileInfoController extends BaseController { + @Autowired + private IBmsFileInfoService bmsFileInfoService; + + /** + * 鏌ヨ鏂囦欢瀛樺偍璇存槑璇︽儏鍒楄〃 + */ +// @RequiresPermissions("system:fileInfo:list") + @GetMapping("/list") + public TableDataInfo list(BmsFileInfo bmsFileInfo) { + startPage(); + List list = bmsFileInfoService.selectBmsFileInfoList(bmsFileInfo); + return getDataTable(list); + } + + /** + * 瀵煎嚭鏂囦欢瀛樺偍璇存槑璇︽儏鍒楄〃 + */ +// @RequiresPermissions("system:fileInfo:export") + @Log(title = "鏂囦欢瀛樺偍璇存槑璇︽儏", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BmsFileInfo bmsFileInfo) { + List list = bmsFileInfoService.selectBmsFileInfoList(bmsFileInfo); + ExcelUtil util = new ExcelUtil(BmsFileInfo.class); + util.exportExcel(response, list, "鏂囦欢瀛樺偍璇存槑璇︽儏鏁版嵁"); + } + + /** + * 鑾峰彇鏂囦欢瀛樺偍璇存槑璇︽儏璇︾粏淇℃伅 + */ +// @RequiresPermissions("system:fileInfo:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(bmsFileInfoService.selectBmsFileInfoById(id)); + } + + /** + * 鏂板鏂囦欢瀛樺偍璇存槑璇︽儏 + */ +// @RequiresPermissions("system:fileInfo:add") + @Log(title = "鏂囦欢瀛樺偍璇存槑璇︽儏", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BmsFileInfo bmsFileInfo) { + return toAjax(bmsFileInfoService.insertBmsFileInfo(bmsFileInfo)); + } + + /** + * 淇敼鏂囦欢瀛樺偍璇存槑璇︽儏 + */ +// @RequiresPermissions("system:fileInfo:edit") + @Log(title = "鏂囦欢瀛樺偍璇存槑璇︽儏", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BmsFileInfo bmsFileInfo) { + return toAjax(bmsFileInfoService.updateBmsFileInfo(bmsFileInfo)); + } + + /** + * 鍒犻櫎鏂囦欢瀛樺偍璇存槑璇︽儏 + */ +// @RequiresPermissions("system:fileInfo:remove") + @Log(title = "鏂囦欢瀛樺偍璇存槑璇︽儏", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(bmsFileInfoService.deleteBmsFileInfoByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsFundingDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsFundingDetailController.java new file mode 100644 index 0000000..0ce76fd --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsFundingDetailController.java @@ -0,0 +1,97 @@ +package com.ruoyi.jjh.declaration.controller; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.BmsFundingDetail; +import com.ruoyi.jjh.declaration.service.IBmsFundingDetailService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 璧勯噾淇℃伅璇︽儏Controller + * + * @author farben + * @date 2023-09-04 + */ +@RestController +@RequestMapping("/fundingDetail") +public class BmsFundingDetailController extends BaseController { + @Autowired + private IBmsFundingDetailService bmsFundingDetailService; + + /** + * 鏌ヨ璧勯噾淇℃伅璇︽儏鍒楄〃 + */ +// @RequiresPermissions("system:fundingDetail:list") + @GetMapping("/list") + public TableDataInfo list(BmsFundingDetail bmsFundingDetail) { + startPage(); + List list = bmsFundingDetailService.selectBmsFundingDetailList(bmsFundingDetail); + return getDataTable(list); + } + + /** + * 瀵煎嚭璧勯噾淇℃伅璇︽儏鍒楄〃 + */ +// @RequiresPermissions("system:fundingDetail:export") + @Log(title = "璧勯噾淇℃伅璇︽儏", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BmsFundingDetail bmsFundingDetail) { + List list = bmsFundingDetailService.selectBmsFundingDetailList(bmsFundingDetail); + ExcelUtil util = new ExcelUtil(BmsFundingDetail.class); + util.exportExcel(response, list, "璧勯噾淇℃伅璇︽儏鏁版嵁"); + } + + /** + * 鑾峰彇璧勯噾淇℃伅璇︽儏璇︾粏淇℃伅 + */ +// @RequiresPermissions("system:fundingDetail:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(bmsFundingDetailService.selectBmsFundingDetailById(id)); + } + + /** + * 鏂板璧勯噾淇℃伅璇︽儏 + */ +// @RequiresPermissions("system:fundingDetail:add") + @Log(title = "璧勯噾淇℃伅璇︽儏", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BmsFundingDetail bmsFundingDetail) { + return toAjax(bmsFundingDetailService.insertBmsFundingDetail(bmsFundingDetail)); + } + + /** + * 淇敼璧勯噾淇℃伅璇︽儏 + */ +// @RequiresPermissions("system:fundingDetail:edit") + @Log(title = "璧勯噾淇℃伅璇︽儏", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BmsFundingDetail bmsFundingDetail) { + return toAjax(bmsFundingDetailService.updateBmsFundingDetail(bmsFundingDetail)); + } + + /** + * 鍒犻櫎璧勯噾淇℃伅璇︽儏 + */ +// @RequiresPermissions("system:fundingDetail:remove") + @Log(title = "璧勯噾淇℃伅璇︽儏", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(bmsFundingDetailService.deleteBmsFundingDetailByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsIndustrialInternetAwardController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsIndustrialInternetAwardController.java new file mode 100644 index 0000000..b4aafc8 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsIndustrialInternetAwardController.java @@ -0,0 +1,99 @@ +package com.ruoyi.jjh.declaration.controller; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.BmsIndustrialInternetAward; +import com.ruoyi.jjh.declaration.entity.dto.BmsIndustrialInternetAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsIndustrialInternetAwardUpdateDto; +import com.ruoyi.jjh.declaration.service.IBmsIndustrialInternetAwardService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 5G+宸ヤ笟浜掕仈缃戝琛ontroller + * + * @author farben + * @date 2023-08-25 + */ +@RestController +@RequestMapping("/industrialInternetAward") +public class BmsIndustrialInternetAwardController extends BaseController { + @Autowired + private IBmsIndustrialInternetAwardService bmsIndustrialInternetAwardService; + + /** + * 鏌ヨ5G+宸ヤ笟浜掕仈缃戝琛ュ垪琛 + */ +// @RequiresPermissions("system:industrialInternetAward:list") + @GetMapping("/list") + public TableDataInfo list(BmsIndustrialInternetAward bmsIndustrialInternetAward) { + startPage(); + List list = bmsIndustrialInternetAwardService.selectBmsIndustrialInternetAwardList(bmsIndustrialInternetAward); + return getDataTable(list); + } + + /** + * 瀵煎嚭5G+宸ヤ笟浜掕仈缃戝琛ュ垪琛 + */ +// @RequiresPermissions("system:industrialInternetAward:export") + @Log(title = "5G+宸ヤ笟浜掕仈缃戝琛", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BmsIndustrialInternetAward bmsIndustrialInternetAward) { + List list = bmsIndustrialInternetAwardService.selectBmsIndustrialInternetAwardList(bmsIndustrialInternetAward); + ExcelUtil util = new ExcelUtil(BmsIndustrialInternetAward.class); + util.exportExcel(response, list, "5G+宸ヤ笟浜掕仈缃戝琛ユ暟鎹"); + } + + /** + * 鑾峰彇5G+宸ヤ笟浜掕仈缃戝琛ヨ缁嗕俊鎭 + */ +// @RequiresPermissions("system:industrialInternetAward:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(bmsIndustrialInternetAwardService.selectBmsIndustrialInternetAwardById(id)); + } + + /** + * 鏂板5G+宸ヤ笟浜掕仈缃戝琛 + */ +// @RequiresPermissions("system:industrialInternetAward:add") + @Log(title = "5G+宸ヤ笟浜掕仈缃戝琛", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BmsIndustrialInternetAwardAddDto bmsIndustrialInternetAwardAddDto) { + return toAjax(bmsIndustrialInternetAwardService.insertBmsIndustrialInternetAward(bmsIndustrialInternetAwardAddDto)); + } + + /** + * 淇敼5G+宸ヤ笟浜掕仈缃戝琛 + */ +// @RequiresPermissions("system:industrialInternetAward:edit") + @Log(title = "5G+宸ヤ笟浜掕仈缃戝琛", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BmsIndustrialInternetAwardUpdateDto bmsIndustrialInternetAwardUpdateDto) { + return toAjax(bmsIndustrialInternetAwardService.updateBmsIndustrialInternetAward(bmsIndustrialInternetAwardUpdateDto)); + } + + /** + * 鍒犻櫎5G+宸ヤ笟浜掕仈缃戝琛 + */ +// @RequiresPermissions("system:industrialInternetAward:remove") + @Log(title = "5G+宸ヤ笟浜掕仈缃戝琛", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(bmsIndustrialInternetAwardService.deleteBmsIndustrialInternetAwardByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsIntegrationIndustriesController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsIntegrationIndustriesController.java new file mode 100644 index 0000000..e7b124e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsIntegrationIndustriesController.java @@ -0,0 +1,99 @@ +package com.ruoyi.jjh.declaration.controller; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.BmsIntegrationIndustries; +import com.ruoyi.jjh.declaration.entity.dto.BmsIntegrationIndustriesAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsIntegrationIndustriesUpdateDto; +import com.ruoyi.jjh.declaration.service.IBmsIntegrationIndustriesService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 涓や笟铻嶅悎濂栬ˉController + * + * @author farben + * @date 2023-09-04 + */ +@RestController +@RequestMapping("/integrationIndustries") +public class BmsIntegrationIndustriesController extends BaseController { + @Autowired + private IBmsIntegrationIndustriesService bmsIntegrationIndustriesService; + + /** + * 鏌ヨ涓や笟铻嶅悎濂栬ˉ鍒楄〃 + */ +// @RequiresPermissions("system:integrationIndustries:list") + @GetMapping("/list") + public TableDataInfo list(BmsIntegrationIndustries bmsIntegrationIndustries) { + startPage(); + List list = bmsIntegrationIndustriesService.selectBmsIntegrationIndustriesList(bmsIntegrationIndustries); + return getDataTable(list); + } + + /** + * 瀵煎嚭涓や笟铻嶅悎濂栬ˉ鍒楄〃 + */ +// @RequiresPermissions("system:integrationIndustries:export") + @Log(title = "涓や笟铻嶅悎濂栬ˉ", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BmsIntegrationIndustries bmsIntegrationIndustries) { + List list = bmsIntegrationIndustriesService.selectBmsIntegrationIndustriesList(bmsIntegrationIndustries); + ExcelUtil util = new ExcelUtil(BmsIntegrationIndustries.class); + util.exportExcel(response, list, "涓や笟铻嶅悎濂栬ˉ鏁版嵁"); + } + + /** + * 鑾峰彇涓や笟铻嶅悎濂栬ˉ璇︾粏淇℃伅 + */ +// @RequiresPermissions("system:integrationIndustries:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(bmsIntegrationIndustriesService.selectBmsIntegrationIndustriesById(id)); + } + + /** + * 鏂板涓や笟铻嶅悎濂栬ˉ + */ +// @RequiresPermissions("system:integrationIndustries:add") + @Log(title = "涓や笟铻嶅悎濂栬ˉ", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BmsIntegrationIndustriesAddDto bmsIntegrationIndustriesAddDto) { + return toAjax(bmsIntegrationIndustriesService.insertBmsIntegrationIndustries(bmsIntegrationIndustriesAddDto)); + } + + /** + * 淇敼涓や笟铻嶅悎濂栬ˉ + */ +// @RequiresPermissions("system:integrationIndustries:edit") + @Log(title = "涓や笟铻嶅悎濂栬ˉ", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BmsIntegrationIndustriesUpdateDto bmsIntegrationIndustriesUpdateDto) { + return toAjax(bmsIntegrationIndustriesService.updateBmsIntegrationIndustries(bmsIntegrationIndustriesUpdateDto)); + } + + /** + * 鍒犻櫎涓や笟铻嶅悎濂栬ˉ + */ +// @RequiresPermissions("system:integrationIndustries:remove") + @Log(title = "涓や笟铻嶅悎濂栬ˉ", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(bmsIntegrationIndustriesService.deleteBmsIntegrationIndustriesByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsLogisticsDevelopmentAwardController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsLogisticsDevelopmentAwardController.java new file mode 100644 index 0000000..461285c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsLogisticsDevelopmentAwardController.java @@ -0,0 +1,99 @@ +package com.ruoyi.jjh.declaration.controller; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.BmsLogisticsDevelopmentAward; +import com.ruoyi.jjh.declaration.entity.dto.BmsLogisticsDevelopmentAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsLogisticsDevelopmentAwardUpdateDto; +import com.ruoyi.jjh.declaration.service.IBmsLogisticsDevelopmentAwardService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 鐗╂祦鍙戝睍濂栬ˉController + * + * @author farben + * @date 2023-08-25 + */ +@RestController +@RequestMapping("/logisticsDevelopmentAward") +public class BmsLogisticsDevelopmentAwardController extends BaseController { + @Autowired + private IBmsLogisticsDevelopmentAwardService bmsLogisticsDevelopmentAwardService; + + /** + * 鏌ヨ鐗╂祦鍙戝睍濂栬ˉ鍒楄〃 + */ +// @RequiresPermissions("system:logisticsDevelopmentAward:list") + @GetMapping("/list") + public TableDataInfo list(BmsLogisticsDevelopmentAward bmsLogisticsDevelopmentAward) { + startPage(); + List list = bmsLogisticsDevelopmentAwardService.selectBmsLogisticsDevelopmentAwardList(bmsLogisticsDevelopmentAward); + return getDataTable(list); + } + + /** + * 瀵煎嚭鐗╂祦鍙戝睍濂栬ˉ鍒楄〃 + */ +// @RequiresPermissions("system:logisticsDevelopmentAward:export") + @Log(title = "鐗╂祦鍙戝睍濂栬ˉ", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BmsLogisticsDevelopmentAward bmsLogisticsDevelopmentAward) { + List list = bmsLogisticsDevelopmentAwardService.selectBmsLogisticsDevelopmentAwardList(bmsLogisticsDevelopmentAward); + ExcelUtil util = new ExcelUtil(BmsLogisticsDevelopmentAward.class); + util.exportExcel(response, list, "鐗╂祦鍙戝睍濂栬ˉ鏁版嵁"); + } + + /** + * 鑾峰彇鐗╂祦鍙戝睍濂栬ˉ璇︾粏淇℃伅 + */ +// @RequiresPermissions("system:logisticsDevelopmentAward:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(bmsLogisticsDevelopmentAwardService.selectBmsLogisticsDevelopmentAwardById(id)); + } + + /** + * 鏂板鐗╂祦鍙戝睍濂栬ˉ + */ +// @RequiresPermissions("system:logisticsDevelopmentAward:add") + @Log(title = "鐗╂祦鍙戝睍濂栬ˉ", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BmsLogisticsDevelopmentAwardAddDto bmsLogisticsDevelopmentAwardAddDto) { + return toAjax(bmsLogisticsDevelopmentAwardService.insertBmsLogisticsDevelopmentAward(bmsLogisticsDevelopmentAwardAddDto)); + } + + /** + * 淇敼鐗╂祦鍙戝睍濂栬ˉ + */ +// @RequiresPermissions("system:logisticsDevelopmentAward:edit") + @Log(title = "鐗╂祦鍙戝睍濂栬ˉ", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BmsLogisticsDevelopmentAwardUpdateDto bmsLogisticsDevelopmentAwardUpdateDto) { + return toAjax(bmsLogisticsDevelopmentAwardService.updateBmsLogisticsDevelopmentAward(bmsLogisticsDevelopmentAwardUpdateDto)); + } + + /** + * 鍒犻櫎鐗╂祦鍙戝睍濂栬ˉ + */ +// @RequiresPermissions("system:logisticsDevelopmentAward:remove") + @Log(title = "鐗╂祦鍙戝睍濂栬ˉ", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(bmsLogisticsDevelopmentAwardService.deleteBmsLogisticsDevelopmentAwardByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsManufacturingServicesAwardController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsManufacturingServicesAwardController.java new file mode 100644 index 0000000..56bc940 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsManufacturingServicesAwardController.java @@ -0,0 +1,99 @@ +package com.ruoyi.jjh.declaration.controller; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.BmsManufacturingServicesAward; +import com.ruoyi.jjh.declaration.entity.dto.BmsManufacturingServicesAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsManufacturingServicesAwardUpdateDto; +import com.ruoyi.jjh.declaration.service.IBmsManufacturingServicesAwardService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉController + * + * @author farben + * @date 2023-08-25 + */ +@RestController +@RequestMapping("/manufacturingServicesAward") +public class BmsManufacturingServicesAwardController extends BaseController { + @Autowired + private IBmsManufacturingServicesAwardService bmsManufacturingServicesAwardService; + + /** + * 鏌ヨ鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ鍒楄〃 + */ +// @RequiresPermissions("system:manufacturingServicesAward:list") + @GetMapping("/list") + public TableDataInfo list(BmsManufacturingServicesAward bmsManufacturingServicesAward) { + startPage(); + List list = bmsManufacturingServicesAwardService.selectBmsManufacturingServicesAwardList(bmsManufacturingServicesAward); + return getDataTable(list); + } + + /** + * 瀵煎嚭鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ鍒楄〃 + */ +// @RequiresPermissions("system:manufacturingServicesAward:export") + @Log(title = "鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BmsManufacturingServicesAward bmsManufacturingServicesAward) { + List list = bmsManufacturingServicesAwardService.selectBmsManufacturingServicesAwardList(bmsManufacturingServicesAward); + ExcelUtil util = new ExcelUtil(BmsManufacturingServicesAward.class); + util.exportExcel(response, list, "鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ鏁版嵁"); + } + + /** + * 鑾峰彇鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ璇︾粏淇℃伅 + */ +// @RequiresPermissions("system:manufacturingServicesAward:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(bmsManufacturingServicesAwardService.selectBmsManufacturingServicesAwardById(id)); + } + + /** + * 鏂板鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + */ +// @RequiresPermissions("system:manufacturingServicesAward:add") + @Log(title = "鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BmsManufacturingServicesAwardAddDto bmsManufacturingServicesAwardAddDto) { + return toAjax(bmsManufacturingServicesAwardService.insertBmsManufacturingServicesAward(bmsManufacturingServicesAwardAddDto)); + } + + /** + * 淇敼鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + */ +// @RequiresPermissions("system:manufacturingServicesAward:edit") + @Log(title = "鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BmsManufacturingServicesAwardUpdateDto bmsManufacturingServicesAwardUpdateDto) { + return toAjax(bmsManufacturingServicesAwardService.updateBmsManufacturingServicesAward(bmsManufacturingServicesAwardUpdateDto)); + } + + /** + * 鍒犻櫎鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + */ +// @RequiresPermissions("system:manufacturingServicesAward:remove") + @Log(title = "鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(bmsManufacturingServicesAwardService.deleteBmsManufacturingServicesAwardByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsOpenInterfaceController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsOpenInterfaceController.java new file mode 100644 index 0000000..31254cb --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsOpenInterfaceController.java @@ -0,0 +1,54 @@ +package com.ruoyi.jjh.declaration.controller; + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.BmsProjectInfo; +import com.ruoyi.jjh.declaration.entity.dto.OpenInterfaceApplyAddDto; +import com.ruoyi.jjh.declaration.entity.vo.EnterpriseInfoTemplateVo; +import com.ruoyi.jjh.declaration.service.IOpenInterfaceService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +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; + + +/** + * 瀹℃壒璁板綍淇℃伅Controller + * + * @author farben + * @date 2023-09-09 + */ +@RestController +@RequestMapping("/openInterface") +public class BmsOpenInterfaceController extends BaseController { + + @Autowired + private IOpenInterfaceService iOpenInterfaceService; + + @GetMapping("/enterpriseInfo/{creditCode}") + public AjaxResult enterpriseInfo(@PathVariable("creditCode") String creditCode) { + EnterpriseInfoTemplateVo enterpriseInfoTemplateVo = iOpenInterfaceService.enterpriseList(creditCode); + return success(enterpriseInfoTemplateVo); + } + + @Log(title = "鏂板鐢虫姤璁板綍", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody OpenInterfaceApplyAddDto openInterfaceApplyAddDto) { + return toAjax(iOpenInterfaceService.insertOpenInterfaceApplyAddDto(openInterfaceApplyAddDto)); + } + + @GetMapping("/{templateRecordId}") + public AjaxResult getProjectInfo(@PathVariable("templateRecordId") Long templateRecordId) { + BmsProjectInfo bmsProjectInfo = iOpenInterfaceService.getProjectInfo(templateRecordId); + return success(bmsProjectInfo); + } + + + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsPlatformConstructionAwardController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsPlatformConstructionAwardController.java new file mode 100644 index 0000000..fa55ded --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsPlatformConstructionAwardController.java @@ -0,0 +1,99 @@ +package com.ruoyi.jjh.declaration.controller; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.BmsPlatformConstructionAward; +import com.ruoyi.jjh.declaration.entity.dto.BmsPlatformConstructionAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsPlatformConstructionAwardUpdateDto; +import com.ruoyi.jjh.declaration.service.IBmsPlatformConstructionAwardService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 骞冲彴寤鸿濂栬ˉController + * + * @author farben + * @date 2023-08-25 + */ +@RestController +@RequestMapping("/platformConstructionAward") +public class BmsPlatformConstructionAwardController extends BaseController { + @Autowired + private IBmsPlatformConstructionAwardService bmsPlatformConstructionAwardService; + + /** + * 鏌ヨ骞冲彴寤鸿濂栬ˉ鍒楄〃 + */ +// @RequiresPermissions("system:platformConstructionAward:list") + @GetMapping("/list") + public TableDataInfo list(BmsPlatformConstructionAward bmsPlatformConstructionAward) { + startPage(); + List list = bmsPlatformConstructionAwardService.selectBmsPlatformConstructionAwardList(bmsPlatformConstructionAward); + return getDataTable(list); + } + + /** + * 瀵煎嚭骞冲彴寤鸿濂栬ˉ鍒楄〃 + */ +// @RequiresPermissions("system:platformConstructionAward:export") + @Log(title = "骞冲彴寤鸿濂栬ˉ", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BmsPlatformConstructionAward bmsPlatformConstructionAward) { + List list = bmsPlatformConstructionAwardService.selectBmsPlatformConstructionAwardList(bmsPlatformConstructionAward); + ExcelUtil util = new ExcelUtil(BmsPlatformConstructionAward.class); + util.exportExcel(response, list, "骞冲彴寤鸿濂栬ˉ鏁版嵁"); + } + + /** + * 鑾峰彇骞冲彴寤鸿濂栬ˉ璇︾粏淇℃伅 + */ +// @RequiresPermissions("system:platformConstructionAward:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(bmsPlatformConstructionAwardService.selectBmsPlatformConstructionAwardById(id)); + } + + /** + * 鏂板骞冲彴寤鸿濂栬ˉ + */ +// @RequiresPermissions("system:platformConstructionAward:add") + @Log(title = "骞冲彴寤鸿濂栬ˉ", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BmsPlatformConstructionAwardAddDto bmsPlatformConstructionAwardAddDto) { + return toAjax(bmsPlatformConstructionAwardService.insertBmsPlatformConstructionAward(bmsPlatformConstructionAwardAddDto)); + } + + /** + * 淇敼骞冲彴寤鸿濂栬ˉ + */ +// @RequiresPermissions("system:platformConstructionAward:edit") + @Log(title = "骞冲彴寤鸿濂栬ˉ", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BmsPlatformConstructionAwardUpdateDto bmsPlatformConstructionAwardUpdateDto) { + return toAjax(bmsPlatformConstructionAwardService.updateBmsPlatformConstructionAward(bmsPlatformConstructionAwardUpdateDto)); + } + + /** + * 鍒犻櫎骞冲彴寤鸿濂栬ˉ + */ +// @RequiresPermissions("system:platformConstructionAward:remove") + @Log(title = "骞冲彴寤鸿濂栬ˉ", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(bmsPlatformConstructionAwardService.deleteBmsPlatformConstructionAwardByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsProcessInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsProcessInfoController.java new file mode 100644 index 0000000..fa1bc5b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsProcessInfoController.java @@ -0,0 +1,97 @@ +package com.ruoyi.jjh.declaration.controller; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.BmsProcessInfo; +import com.ruoyi.jjh.declaration.service.IBmsProcessInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 瀹℃壒娴佺▼Controller + * + * @author farben + * @date 2023-09-09 + */ +@RestController +@RequestMapping("/processInfo") +public class BmsProcessInfoController extends BaseController { + @Autowired + private IBmsProcessInfoService bmsProcessInfoService; + + /** + * 鏌ヨ瀹℃壒娴佺▼鍒楄〃 + */ +// @RequiresPermissions("system:processInfo:list") + @GetMapping("/list") + public TableDataInfo list(BmsProcessInfo bmsProcessInfo) { + startPage(); + List list = bmsProcessInfoService.selectBmsProcessInfoList(bmsProcessInfo); + return getDataTable(list); + } + + /** + * 瀵煎嚭瀹℃壒娴佺▼鍒楄〃 + */ +// @RequiresPermissions("system:processInfo:export") + @Log(title = "瀹℃壒娴佺▼", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BmsProcessInfo bmsProcessInfo) { + List list = bmsProcessInfoService.selectBmsProcessInfoList(bmsProcessInfo); + ExcelUtil util = new ExcelUtil(BmsProcessInfo.class); + util.exportExcel(response, list, "瀹℃壒娴佺▼鏁版嵁"); + } + + /** + * 鑾峰彇瀹℃壒娴佺▼璇︾粏淇℃伅 + */ +// @RequiresPermissions("system:processInfo:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(bmsProcessInfoService.selectBmsProcessInfoById(id)); + } + + /** + * 鏂板瀹℃壒娴佺▼ + */ +// @RequiresPermissions("system:processInfo:add") + @Log(title = "瀹℃壒娴佺▼", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BmsProcessInfo bmsProcessInfo) { + return toAjax(bmsProcessInfoService.insertBmsProcessInfo(bmsProcessInfo)); + } + + /** + * 淇敼瀹℃壒娴佺▼ + */ +// @RequiresPermissions("system:processInfo:edit") + @Log(title = "瀹℃壒娴佺▼", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BmsProcessInfo bmsProcessInfo) { + return toAjax(bmsProcessInfoService.updateBmsProcessInfo(bmsProcessInfo)); + } + + /** + * 鍒犻櫎瀹℃壒娴佺▼ + */ +// @RequiresPermissions("system:processInfo:remove") + @Log(title = "瀹℃壒娴佺▼", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(bmsProcessInfoService.deleteBmsProcessInfoByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsProjectInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsProjectInfoController.java new file mode 100644 index 0000000..d7fa40e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsProjectInfoController.java @@ -0,0 +1,97 @@ +package com.ruoyi.jjh.declaration.controller; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.BmsProjectInfo; +import com.ruoyi.jjh.declaration.service.IBmsProjectInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 椤圭洰鍩烘湰淇℃伅Controller + * + * @author farben + * @date 2023-09-09 + */ +@RestController +@RequestMapping("/projectInfo") +public class BmsProjectInfoController extends BaseController { + @Autowired + private IBmsProjectInfoService bmsProjectInfoService; + + /** + * 鏌ヨ椤圭洰鍩烘湰淇℃伅鍒楄〃 + */ +// @RequiresPermissions("system:projectInfo:list") + @GetMapping("/list") + public TableDataInfo list(BmsProjectInfo bmsProjectInfo) { + startPage(); + List list = bmsProjectInfoService.selectBmsProjectInfoList(bmsProjectInfo); + return getDataTable(list); + } + + /** + * 瀵煎嚭椤圭洰鍩烘湰淇℃伅鍒楄〃 + */ +// @RequiresPermissions("system:projectInfo:export") + @Log(title = "椤圭洰鍩烘湰淇℃伅", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BmsProjectInfo bmsProjectInfo) { + List list = bmsProjectInfoService.selectBmsProjectInfoList(bmsProjectInfo); + ExcelUtil util = new ExcelUtil(BmsProjectInfo.class); + util.exportExcel(response, list, "椤圭洰鍩烘湰淇℃伅鏁版嵁"); + } + + /** + * 鑾峰彇椤圭洰鍩烘湰淇℃伅璇︾粏淇℃伅 + */ +// @RequiresPermissions("system:projectInfo:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(bmsProjectInfoService.selectBmsProjectInfoById(id)); + } + + /** + * 鏂板椤圭洰鍩烘湰淇℃伅 + */ +// @RequiresPermissions("system:projectInfo:add") + @Log(title = "椤圭洰鍩烘湰淇℃伅", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BmsProjectInfo bmsProjectInfo) { + return toAjax(bmsProjectInfoService.insertBmsProjectInfo(bmsProjectInfo)); + } + + /** + * 淇敼椤圭洰鍩烘湰淇℃伅 + */ +// @RequiresPermissions("system:projectInfo:edit") + @Log(title = "椤圭洰鍩烘湰淇℃伅", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BmsProjectInfo bmsProjectInfo) { + return toAjax(bmsProjectInfoService.updateBmsProjectInfo(bmsProjectInfo)); + } + + /** + * 鍒犻櫎椤圭洰鍩烘湰淇℃伅 + */ +// @RequiresPermissions("system:projectInfo:remove") + @Log(title = "椤圭洰鍩烘湰淇℃伅", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(bmsProjectInfoService.deleteBmsProjectInfoByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsProjectSettlementAwardController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsProjectSettlementAwardController.java new file mode 100644 index 0000000..3db84e0 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsProjectSettlementAwardController.java @@ -0,0 +1,99 @@ +package com.ruoyi.jjh.declaration.controller; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.BmsProjectSettlementAward; +import com.ruoyi.jjh.declaration.entity.dto.BmsProjectSettlementAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsProjectSettlementAwardUpdateDto; +import com.ruoyi.jjh.declaration.service.IBmsProjectSettlementAwardService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 椤圭洰钀芥埛濂栬ˉController + * + * @author farben + * @date 2023-08-25 + */ +@RestController +@RequestMapping("/projectSettlementAward") +public class BmsProjectSettlementAwardController extends BaseController { + @Autowired + private IBmsProjectSettlementAwardService bmsProjectSettlementAwardService; + + /** + * 鏌ヨ椤圭洰钀芥埛濂栬ˉ鍒楄〃 + */ +// @RequiresPermissions("system:projectSettlementAward:list") + @GetMapping("/list") + public TableDataInfo list(BmsProjectSettlementAward bmsProjectSettlementAward) { + startPage(); + List list = bmsProjectSettlementAwardService.selectBmsProjectSettlementAwardList(bmsProjectSettlementAward); + return getDataTable(list); + } + + /** + * 瀵煎嚭椤圭洰钀芥埛濂栬ˉ鍒楄〃 + */ +// @RequiresPermissions("system:projectSettlementAward:export") + @Log(title = "椤圭洰钀芥埛濂栬ˉ", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BmsProjectSettlementAward bmsProjectSettlementAward) { + List list = bmsProjectSettlementAwardService.selectBmsProjectSettlementAwardList(bmsProjectSettlementAward); + ExcelUtil util = new ExcelUtil(BmsProjectSettlementAward.class); + util.exportExcel(response, list, "椤圭洰钀芥埛濂栬ˉ鏁版嵁"); + } + + /** + * 鑾峰彇椤圭洰钀芥埛濂栬ˉ璇︾粏淇℃伅 + */ +// @RequiresPermissions("system:projectSettlementAward:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(bmsProjectSettlementAwardService.selectBmsProjectSettlementAwardById(id)); + } + + /** + * 鏂板椤圭洰钀芥埛濂栬ˉ + */ +// @RequiresPermissions("system:projectSettlementAward:add") + @Log(title = "椤圭洰钀芥埛濂栬ˉ", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BmsProjectSettlementAwardAddDto bmsProjectSettlementAwardAddDto) { + return toAjax(bmsProjectSettlementAwardService.insertBmsProjectSettlementAward(bmsProjectSettlementAwardAddDto)); + } + + /** + * 淇敼椤圭洰钀芥埛濂栬ˉ + */ +// @RequiresPermissions("system:projectSettlementAward:edit") + @Log(title = "椤圭洰钀芥埛濂栬ˉ", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BmsProjectSettlementAwardUpdateDto bmsProjectSettlementAwardUpdateDto) { + return toAjax(bmsProjectSettlementAwardService.updateBmsProjectSettlementAward(bmsProjectSettlementAwardUpdateDto)); + } + + /** + * 鍒犻櫎椤圭洰钀芥埛濂栬ˉ + */ +// @RequiresPermissions("system:projectSettlementAward:remove") + @Log(title = "椤圭洰钀芥埛濂栬ˉ", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(bmsProjectSettlementAwardService.deleteBmsProjectSettlementAwardByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsSceneOpeningAwardController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsSceneOpeningAwardController.java new file mode 100644 index 0000000..25b1c87 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsSceneOpeningAwardController.java @@ -0,0 +1,99 @@ +package com.ruoyi.jjh.declaration.controller; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.BmsSceneOpeningAward; +import com.ruoyi.jjh.declaration.entity.dto.BmsSceneOpeningAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsSceneOpeningAwardUpdateDto; +import com.ruoyi.jjh.declaration.service.IBmsSceneOpeningAwardService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 鍦烘櫙寮鏀惧琛ontroller + * + * @author farben + * @date 2023-08-25 + */ +@RestController +@RequestMapping("/sceneOpeningAward") +public class BmsSceneOpeningAwardController extends BaseController { + @Autowired + private IBmsSceneOpeningAwardService bmsSceneOpeningAwardService; + + /** + * 鏌ヨ鍦烘櫙寮鏀惧琛ュ垪琛 + */ +// @RequiresPermissions("system:sceneOpeningAward:list") + @GetMapping("/list") + public TableDataInfo list(BmsSceneOpeningAward bmsSceneOpeningAward) { + startPage(); + List list = bmsSceneOpeningAwardService.selectBmsSceneOpeningAwardList(bmsSceneOpeningAward); + return getDataTable(list); + } + + /** + * 瀵煎嚭鍦烘櫙寮鏀惧琛ュ垪琛 + */ +// @RequiresPermissions("system:sceneOpeningAward:export") + @Log(title = "鍦烘櫙寮鏀惧琛", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BmsSceneOpeningAward bmsSceneOpeningAward) { + List list = bmsSceneOpeningAwardService.selectBmsSceneOpeningAwardList(bmsSceneOpeningAward); + ExcelUtil util = new ExcelUtil(BmsSceneOpeningAward.class); + util.exportExcel(response, list, "鍦烘櫙寮鏀惧琛ユ暟鎹"); + } + + /** + * 鑾峰彇鍦烘櫙寮鏀惧琛ヨ缁嗕俊鎭 + */ +// @RequiresPermissions("system:sceneOpeningAward:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(bmsSceneOpeningAwardService.selectBmsSceneOpeningAwardById(id)); + } + + /** + * 鏂板鍦烘櫙寮鏀惧琛 + */ +// @RequiresPermissions("system:sceneOpeningAward:add") + @Log(title = "鍦烘櫙寮鏀惧琛", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BmsSceneOpeningAwardAddDto bmsSceneOpeningAwardAddDto) { + return toAjax(bmsSceneOpeningAwardService.insertBmsSceneOpeningAward(bmsSceneOpeningAwardAddDto)); + } + + /** + * 淇敼鍦烘櫙寮鏀惧琛 + */ +// @RequiresPermissions("system:sceneOpeningAward:edit") + @Log(title = "鍦烘櫙寮鏀惧琛", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BmsSceneOpeningAwardUpdateDto bmsSceneOpeningAwardUpdateDto) { + return toAjax(bmsSceneOpeningAwardService.updateBmsSceneOpeningAward(bmsSceneOpeningAwardUpdateDto)); + } + + /** + * 鍒犻櫎鍦烘櫙寮鏀惧琛 + */ +// @RequiresPermissions("system:sceneOpeningAward:remove") + @Log(title = "鍦烘櫙寮鏀惧琛", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(bmsSceneOpeningAwardService.deleteBmsSceneOpeningAwardByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateInfoController.java new file mode 100644 index 0000000..910437c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateInfoController.java @@ -0,0 +1,106 @@ +package com.ruoyi.jjh.declaration.controller; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.BmsTemplateInfo; +import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateInfoQueryVo; +import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 鐢虫姤妯℃澘淇℃伅Controller + * + * @author farben + * @date 2023-08-25 + */ +@RestController +@RequestMapping("/templateInfo") +public class BmsTemplateInfoController extends BaseController { + @Autowired + private IBmsTemplateInfoService bmsTemplateInfoService; + + /** + * 鏌ヨ鐢虫姤妯℃澘淇℃伅鍒楄〃 + */ +// @RequiresPermissions("system:templateInfo:list") + @GetMapping("/list") + public TableDataInfo list(BmsTemplateInfo bmsTemplateInfo) { + startPage(); + List list = bmsTemplateInfoService.selectBmsTemplateInfoList(bmsTemplateInfo); + return getDataTable(list); + } + + /** + * 瀵煎嚭鐢虫姤妯℃澘淇℃伅鍒楄〃 + */ +// @RequiresPermissions("system:templateInfo:export") + @Log(title = "鐢虫姤妯℃澘淇℃伅", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BmsTemplateInfo bmsTemplateInfo) { + List list = bmsTemplateInfoService.selectBmsTemplateInfoList(bmsTemplateInfo); + ExcelUtil util = new ExcelUtil(BmsTemplateInfoQueryVo.class); + util.exportExcel(response, list, "鐢虫姤妯℃澘淇℃伅鏁版嵁"); + } + +// @RequiresPermissions("system:templateInfo:exportTemplate") + @Log(title = "瀵煎嚭妯℃澘琛ㄥ崟", businessType = BusinessType.EXPORT) + @GetMapping(value = "/exportTemplate/{id}") + public void exportTemplate(HttpServletRequest request, HttpServletResponse response,@PathVariable("id")Long id){ + bmsTemplateInfoService.exportTemplate(request,response,id); + } + + /** + * 鑾峰彇鐢虫姤妯℃澘淇℃伅璇︾粏淇℃伅 + */ +// @RequiresPermissions("system:templateInfo:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(bmsTemplateInfoService.selectBmsTemplateInfoById(id)); + } + + /** + * 鏂板鐢虫姤妯℃澘淇℃伅 + */ +// @RequiresPermissions("system:templateInfo:add") + @Log(title = "鐢虫姤妯℃澘淇℃伅", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BmsTemplateInfo bmsTemplateInfo) { + return toAjax(bmsTemplateInfoService.insertBmsTemplateInfo(bmsTemplateInfo)); + } + + /** + * 淇敼鐢虫姤妯℃澘淇℃伅 + */ +// @RequiresPermissions("system:templateInfo:edit") + @Log(title = "鐢虫姤妯℃澘淇℃伅", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BmsTemplateInfo bmsTemplateInfo) { + return toAjax(bmsTemplateInfoService.updateBmsTemplateInfo(bmsTemplateInfo)); + } + + /** + * 鍒犻櫎鐢虫姤妯℃澘淇℃伅 + */ +// @RequiresPermissions("system:templateInfo:remove") + @Log(title = "鐢虫姤妯℃澘淇℃伅", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(bmsTemplateInfoService.deleteBmsTemplateInfoByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateRecordController.java new file mode 100644 index 0000000..db6ef6e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateRecordController.java @@ -0,0 +1,107 @@ +package com.ruoyi.jjh.declaration.controller; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateQueryDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordQueryDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordUpdateDto; +import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordQueryVo; +import com.ruoyi.jjh.declaration.service.IBmsTemplateRecordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 鍦ㄧ嚎妯℃澘Controller + * + * @author farben + * @date 2023-09-07 + */ +@RestController +@RequestMapping("/templateRecord") +public class BmsTemplateRecordController extends BaseController { + @Autowired + private IBmsTemplateRecordService bmsTemplateRecordService; + + /** + * 鏌ヨ鍦ㄧ嚎妯℃澘鍒楄〃 + */ +// @RequiresPermissions("system:templateRecord:list") + @GetMapping("/list") + public TableDataInfo list(BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto) { + startPage(); + List list = bmsTemplateRecordService.selectBmsTemplateRecordList(bmsTemplateRecordQueryDto); + return getDataTable(list); + } + + @GetMapping("/templateNameList") + public TableDataInfo templateNameList(BmsTemplateQueryDto bmsTemplateQueryDto){ + List list = bmsTemplateRecordService.selectBmsTemplateNameList(bmsTemplateQueryDto); + return getDataTable(list); + } + + /** + * 瀵煎嚭鍦ㄧ嚎妯℃澘鍒楄〃 + */ +// @RequiresPermissions("system:templateRecord:export") + @Log(title = "鍦ㄧ嚎妯℃澘", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto) { + List list = bmsTemplateRecordService.selectBmsTemplateRecordList(bmsTemplateRecordQueryDto); + ExcelUtil util = new ExcelUtil(BmsTemplateRecordQueryVo.class); + util.exportExcel(response, list, "鍦ㄧ嚎妯℃澘鏁版嵁"); + } + + /** + * 鑾峰彇鍦ㄧ嚎妯℃澘璇︾粏淇℃伅 + */ +// @RequiresPermissions("system:templateRecord:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(bmsTemplateRecordService.selectBmsTemplateRecordById(id)); + } + + /** + * 鏂板鍦ㄧ嚎妯℃澘 + */ +// @RequiresPermissions("system:templateRecord:add") + @Log(title = "鍦ㄧ嚎妯℃澘", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BmsTemplateRecordAddDto bmsTemplateRecordAddDto) { + return toAjax(bmsTemplateRecordService.insertBmsTemplateRecord(bmsTemplateRecordAddDto)); + } + + /** + * 淇敼鍦ㄧ嚎妯℃澘 + */ +// @RequiresPermissions("system:templateRecord:edit") + @Log(title = "鍦ㄧ嚎妯℃澘", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto) { + return toAjax(bmsTemplateRecordService.updateBmsTemplateRecord(bmsTemplateRecordUpdateDto)); + } + + /** + * 鍒犻櫎鍦ㄧ嚎妯℃澘 + */ +// @RequiresPermissions("system:templateRecord:remove") + @Log(title = "鍦ㄧ嚎妯℃澘", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(bmsTemplateRecordService.deleteBmsTemplateRecordByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BsmFundingInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BsmFundingInfoController.java new file mode 100644 index 0000000..7c7f780 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BsmFundingInfoController.java @@ -0,0 +1,97 @@ +package com.ruoyi.jjh.declaration.controller; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.BsmFundingInfo; +import com.ruoyi.jjh.declaration.service.IBsmFundingInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 璧勯噾淇℃伅Controller + * + * @author farben + * @date 2023-08-25 + */ +@RestController +@RequestMapping("/fundingInfo") +public class BsmFundingInfoController extends BaseController { + @Autowired + private IBsmFundingInfoService bsmFundingInfoService; + + /** + * 鏌ヨ璧勯噾淇℃伅鍒楄〃 + */ +// @RequiresPermissions("system:fundingInfo:list") + @GetMapping("/list") + public TableDataInfo list(BsmFundingInfo bsmFundingInfo) { + startPage(); + List list = bsmFundingInfoService.selectBsmFundingInfoList(bsmFundingInfo); + return getDataTable(list); + } + + /** + * 瀵煎嚭璧勯噾淇℃伅鍒楄〃 + */ +// @RequiresPermissions("system:fundingInfo:export") + @Log(title = "璧勯噾淇℃伅", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BsmFundingInfo bsmFundingInfo) { + List list = bsmFundingInfoService.selectBsmFundingInfoList(bsmFundingInfo); + ExcelUtil util = new ExcelUtil(BsmFundingInfo.class); + util.exportExcel(response, list, "璧勯噾淇℃伅鏁版嵁"); + } + + /** + * 鑾峰彇璧勯噾淇℃伅璇︾粏淇℃伅 + */ +// @RequiresPermissions("system:fundingInfo:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(bsmFundingInfoService.selectBsmFundingInfoById(id)); + } + + /** + * 鏂板璧勯噾淇℃伅 + */ +// @RequiresPermissions("system:fundingInfo:add") + @Log(title = "璧勯噾淇℃伅", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BsmFundingInfo bsmFundingInfo) { + return toAjax(bsmFundingInfoService.insertBsmFundingInfo(bsmFundingInfo)); + } + + /** + * 淇敼璧勯噾淇℃伅 + */ +// @RequiresPermissions("system:fundingInfo:edit") + @Log(title = "璧勯噾淇℃伅", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BsmFundingInfo bsmFundingInfo) { + return toAjax(bsmFundingInfoService.updateBsmFundingInfo(bsmFundingInfo)); + } + + /** + * 鍒犻櫎璧勯噾淇℃伅 + */ +// @RequiresPermissions("system:fundingInfo:remove") + @Log(title = "璧勯噾淇℃伅", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(bsmFundingInfoService.deleteBsmFundingInfoByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsApprovalInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsApprovalInfo.java new file mode 100644 index 0000000..7cd4115 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsApprovalInfo.java @@ -0,0 +1,110 @@ +package com.ruoyi.jjh.declaration.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; + +/** + * 瀹℃壒璁板綍淇℃伅瀵硅薄 bms_approval_info + * + * @author farben + * @date 2023-09-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsApprovalInfo extends BaseInfoEntity { + private static final long serialVersionUID = 1L; + + /** + * 涓婚敭id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 娴佺▼id + */ + @Excel(name = "娴佺▼id") + private Long processId; + + /** + * 鐢虫姤璁板綍id + */ + @Excel(name = "鐢虫姤璁板綍id") + private Long declarationRecordsId; + + @Excel(name = "榛樿瀹℃壒浜篿d") + private Long approvalById; + + /** + * 瀹℃壒鐘舵(0=寰呭鏍.1=瀹℃壒閫氳繃,2=瀹℃壒椹冲洖) + */ + @Excel(name = "瀹℃壒鐘舵(0=寰呭鏍.1=瀹℃壒閫氳繃,2=瀹℃壒椹冲洖)") + private Integer approvalStatus; + + /** + * 瀹℃壒鎰忚 + */ + @Excel(name = "瀹℃壒鎰忚") + private String approvalOpinions; + + /** + * 瀹℃壒闄勪欢 + */ + @Excel(name = "瀹℃壒闄勪欢") + private String approvalAttachment; + + @Excel(name = "瀹℃壒鏃堕棿") + private Date approvalTime; + + /** + * 鏄惁鍙鏍(0=鏄,1=鍚,2=缁撴潫) + */ + @Excel(name = "鏄惁鍙鏍(0=鏄,1=鍚,2=缁撴潫)") + private Integer isReview; + + @Excel(name = "鏄惁涓烘嫆缁濆墠鏁版嵁锛0锛氬惁锛1锛氭槸") + private Integer isBeforeData; + + /** + * 鎺掑簭 + */ + @Excel(name = "鎺掑簭") + private Integer sort; + + /** + * 鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎 + */ + @Excel(name = "鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎") + private Integer isDeleted; + + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("processId", getProcessId()) + .append("declarationRecordsId", getDeclarationRecordsId()) + .append("approvalById", getApprovalById()) + .append("approvalStatus", getApprovalStatus()) + .append("approvalOpinions", getApprovalOpinions()) + .append("approvalAttachment", getApprovalAttachment()) + .append("isReview", getIsReview()) + .append("isBeforeData", getIsBeforeData()) + .append("sort", getSort()) + .append("isDeleted", getIsDeleted()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsBigStrongAward.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsBigStrongAward.java new file mode 100644 index 0000000..1441b80 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsBigStrongAward.java @@ -0,0 +1,134 @@ +package com.ruoyi.jjh.declaration.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; + +/** + * 鍋氬ぇ鍋氬己濂栬鎯呭璞 bms_big_strong_award + * + * @author farben + * @date 2023-08-25 + */ +public class BmsBigStrongAward extends BaseInfoEntity { + private static final long serialVersionUID = 1L; + + /** + * 涓婚敭id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 浼佷笟id + */ + @Excel(name = "浼佷笟id") + private Long enterpriseId; + + /** + * 鏄惁鑾峰緱鍥尯鍏朵粬缁忚惀濂栧姳 + */ + @Excel(name = "鏄惁鑾峰緱鍥尯鍏朵粬缁忚惀濂栧姳锛0锛氭槸锛1锛氬惁", readConverterExp = "0=鏄,1=鍚") + private int isGainRewards; + + @Excel(name = "濂栧姳璇存槑") + private String rewardDescription; + + /** + * 鎴愮珛鏃堕棿 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "鎴愮珛鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd") + private Date establishTime; + + /** + * 浼佷笟杩3骞村彂灞曟儏鍐靛強鏈潵鍙戝睍璁″垝 + */ + @Excel(name = "浼佷笟杩3骞村彂灞曟儏鍐靛強鏈潵鍙戝睍璁″垝") + private String developmentPlan; + + /** + * 鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎 + */ + @Excel(name = "鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎") + private Long isDeleted; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getEnterpriseId() { + return enterpriseId; + } + + public void setEnterpriseId(Long enterpriseId) { + this.enterpriseId = enterpriseId; + } + + public int getIsGainRewards() { + return isGainRewards; + } + + public void setIsGainRewards(int isGainRewards) { + this.isGainRewards = isGainRewards; + } + + public Date getEstablishTime() { + return establishTime; + } + + public void setEstablishTime(Date establishTime) { + this.establishTime = establishTime; + } + + public String getDevelopmentPlan() { + return developmentPlan; + } + + public void setDevelopmentPlan(String developmentPlan) { + this.developmentPlan = developmentPlan; + } + + public String getRewardDescription() { + return rewardDescription; + } + + public void setRewardDescription(String rewardDescription) { + this.rewardDescription = rewardDescription; + } + + public Long getIsDeleted() { + return isDeleted; + } + + public void setIsDeleted(Long isDeleted) { + this.isDeleted = isDeleted; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("enterpriseId", getEnterpriseId()) + .append("isGainRewards", getIsGainRewards()) + .append("establishTime", getEstablishTime()) + .append("developmentPlan", getDevelopmentPlan()) + .append("isDeleted", getIsDeleted()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsBrandingAward.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsBrandingAward.java new file mode 100644 index 0000000..0dba0be --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsBrandingAward.java @@ -0,0 +1,119 @@ +package com.ruoyi.jjh.declaration.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 鍝佺墝鎵撻犲琛ュ璞 bms_branding_award + * + * @author farben + * @date 2023-08-25 + */ +public class BmsBrandingAward extends BaseInfoEntity { + private static final long serialVersionUID = 1L; + + /** + * 涓婚敭id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 浼佷笟id + */ + @Excel(name = "浼佷笟id") + private Long enterpriseId; + + /** + * 鎵鑾疯崳瑾/鎵涓惧姙娲诲姩 + */ + @Excel(name = "鎵鑾疯崳瑾/鎵涓惧姙娲诲姩") + private String honorsReceived; + + /** + * 鎵灞炵瓑绾 + */ + @Excel(name = "鎵灞炵瓑绾") + private Long level; + + /** + * 璇佹槑鏉愭枡 + */ + @Excel(name = "璇佹槑鏉愭枡") + private String evidence; + + /** + * 鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎 + */ + @Excel(name = "鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎") + private Long isDeleted; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getEnterpriseId() { + return enterpriseId; + } + + public void setEnterpriseId(Long enterpriseId) { + this.enterpriseId = enterpriseId; + } + + public String getHonorsReceived() { + return honorsReceived; + } + + public void setHonorsReceived(String honorsReceived) { + this.honorsReceived = honorsReceived; + } + + public Long getLevel() { + return level; + } + + public void setLevel(Long level) { + this.level = level; + } + + public String getEvidence() { + return evidence; + } + + public void setEvidence(String evidence) { + this.evidence = evidence; + } + + public Long getIsDeleted() { + return isDeleted; + } + + public void setIsDeleted(Long isDeleted) { + this.isDeleted = isDeleted; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("enterpriseId", getEnterpriseId()) + .append("honorsReceived", getHonorsReceived()) + .append("level", getLevel()) + .append("evidence", getEvidence()) + .append("isDeleted", getIsDeleted()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsCarrierConstructionAward.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsCarrierConstructionAward.java new file mode 100644 index 0000000..8e3bf39 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsCarrierConstructionAward.java @@ -0,0 +1,63 @@ +package com.ruoyi.jjh.declaration.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 杞戒綋寤鸿濂栬ˉ瀵硅薄 bms_carrier_construction_award + * + * @author farben + * @date 2023-08-25 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsCarrierConstructionAward extends BaseInfoEntity { + private static final long serialVersionUID = 1L; + + /** 涓婚敭id */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** 浼佷笟id */ + @Excel(name = "浼佷笟id") + private Long enterpriseId; + + /** 椤圭洰鍚嶇О */ + @Excel(name = "椤圭洰鍚嶇О") + private String projectName; + + /** 鏂囦綋浼佷笟鏁伴噺鍗犳瘮 */ + @Excel(name = "鏂囦綋浼佷笟鏁伴噺鍗犳瘮") + private String quantityProportion; + + /** 鏂囦綋浼佷笟钀ユ敹鍗犳瘮 */ + @Excel(name = "鏂囦綋浼佷笟钀ユ敹鍗犳瘮") + private String revenueProportion; + + /** 鏂囦綋浼佷笟浠庝笟浜哄憳鍗犳瘮 */ + @Excel(name = "鏂囦綋浼佷笟浠庝笟浜哄憳鍗犳瘮") + private String personnelProportion; + + /** 鐩稿叧浣愯瘉鏉愭枡 */ + @Excel(name = "鐩稿叧浣愯瘉鏉愭枡") + private String supportingMaterials; + + /** 椤圭洰宸ュ晢鐧昏璁稿彲 */ + @Excel(name = "椤圭洰宸ュ晢鐧昏璁稿彲") + private String businessLicense; + + /** 娑堥槻楠屾敹鎶ュ憡 */ + @Excel(name = "娑堥槻楠屾敹鎶ュ憡") + private String fireReport; + + /** 鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎 */ + @Excel(name = "鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎") + private Long isDeleted; + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsCreditManagement.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsCreditManagement.java new file mode 100644 index 0000000..f7cf231 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsCreditManagement.java @@ -0,0 +1,103 @@ +package com.ruoyi.jjh.declaration.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 淇$敤绠$悊濂栬ˉ瀵硅薄 bms_credit_management + * + * @author farben + * @date 2023-09-04 + */ +public class BmsCreditManagement extends BaseInfoEntity { + private static final long serialVersionUID = 1L; + + /** 涓婚敭id */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** 浼佷笟id */ + @Excel(name = "浼佷笟id") + private Long enterpriseId; + + /** 椤圭洰鏂规锛堝寘鎷」鐩熀鏈儏鍐典粙缁嶃侀」鐩姇璧勬儏鍐典互鍙婂疄鏂借繘灞曘侀」鐩洰鏍囧強鍙栧緱鐨勪富瑕佹垚鏁堬級 */ + @Excel(name = "椤圭洰鏂规", readConverterExp = "鍖=鎷」鐩熀鏈儏鍐典粙缁嶃侀」鐩姇璧勬儏鍐典互鍙婂疄鏂借繘灞曘侀」鐩洰鏍囧強鍙栧緱鐨勪富瑕佹垚鏁") + private String projectPlan; + + /** 璧勯噾浣跨敤璇存槑锛堥」鐩湭瀹屾垚鐨勯渶鎻愪緵锛屽唴瀹逛富瑕佸寘鎷」鐩鍒掓姇璧勯锛屾姇璧勬槑缁嗭紝鐩墠宸插畬鎴愭姇璧勬儏鍐靛拰鍚庣画鎶曞叆璁″垝绛夛級 */ + @Excel(name = "璧勯噾浣跨敤璇存槑", readConverterExp = "椤=鐩湭瀹屾垚鐨勯渶鎻愪緵锛屽唴瀹逛富瑕佸寘鎷」鐩鍒掓姇璧勯锛屾姇璧勬槑缁嗭紝鐩墠宸插畬鎴愭姇璧勬儏鍐靛拰鍚庣画鎶曞叆璁″垝绛") + private String usesFunds; + + /** 椤圭洰涓撻」瀹¤鎶ュ憡锛堥」鐩凡瀹屾垚鐨勯渶鎻愪緵锛 */ + @Excel(name = "椤圭洰涓撻」瀹¤鎶ュ憡", readConverterExp = "椤=鐩凡瀹屾垚鐨勯渶鎻愪緵") + private String auditReport; + + /** 鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎 */ + @Excel(name = "鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎") + private Long isDeleted; + + public void setId(Long id){ + this.id = id; + } + + public Long getId(){ + return id; + } + public void setEnterpriseId(Long enterpriseId){ + this.enterpriseId = enterpriseId; + } + + public Long getEnterpriseId(){ + return enterpriseId; + } + public void setProjectPlan(String projectPlan){ + this.projectPlan = projectPlan; + } + + public String getProjectPlan(){ + return projectPlan; + } + public void setUsesFunds(String usesFunds){ + this.usesFunds = usesFunds; + } + + public String getUsesFunds(){ + return usesFunds; + } + public void setAuditReport(String auditReport){ + this.auditReport = auditReport; + } + + public String getAuditReport(){ + return auditReport; + } + public void setIsDeleted(Long isDeleted){ + this.isDeleted = isDeleted; + } + + public Long getIsDeleted(){ + return isDeleted; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("enterpriseId", getEnterpriseId()) + .append("projectPlan", getProjectPlan()) + .append("usesFunds", getUsesFunds()) + .append("auditReport", getAuditReport()) + .append("isDeleted", getIsDeleted()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsDeclarationRecords.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsDeclarationRecords.java new file mode 100644 index 0000000..14e0887 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsDeclarationRecords.java @@ -0,0 +1,94 @@ +package com.ruoyi.jjh.declaration.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 鍦ㄧ嚎鐢虫姤璁板綍瀵硅薄 bms_declaration_records + * + * @author farben + * @date 2023-08-28 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsDeclarationRecords extends BaseInfoEntity { + private static final long serialVersionUID = 1L; + + /** + * 涓婚敭id + */ + @ApiModelProperty(value = "id") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 椤圭洰鍚嶇О + */ + @ApiModelProperty(value = "椤圭洰鍚嶇О") + @Excel(name = "椤圭洰鍚嶇О") + private String projectName; + + @ApiModelProperty(value = "椤圭洰id") + private Long projectId; + + @ApiModelProperty(value = "浜嬮」") + @Excel(name = "浜嬮」") + private String matter; + + /** + * 浼佷笟id + */ + @ApiModelProperty(value = "浼佷笟id") + private Long enterpriseId; + + /** + * 骞翠唤 + */ + @ApiModelProperty(value = "骞翠唤") + @Excel(name = "骞翠唤") + private String year; + + /** + * 鍦ㄧ嚎妯℃澘璁板綍id + */ + @ApiModelProperty(value = "鍦ㄧ嚎妯℃澘璁板綍id") + private Long templateRecordId; + + /** + * 鐢虫姤妯$増绫诲瀷 + */ + @ApiModelProperty(value = "鐢虫姤妯$増绫诲瀷") + private Integer declarationTemplateType; + + /** + * 璇︽儏id锛氬搴旇鎯卛d + */ + @ApiModelProperty(value = "璇︽儏id锛氬搴旇鎯卛d") + private Long detailId; + + + /** + * 瀹℃壒鐘舵 + */ + @ApiModelProperty(value = "瀹℃壒鐘舵") + @Excel(name = "瀹℃壒鐘舵", readConverterExp = "0=鑽夌ǹ,1=鍒濆涓,2=澶嶅涓,3=涓撳璇勫涓,4=甯傜骇璇勫畾涓,5=璇勫畾閫氳繃,6=涓撳璇勫-鎷掔粷,7=澶嶅-鎷掔粷,8=鍒濆-鎷掔粷,9=璇勫畾椹冲洖") + private Long status; + + /** + * 鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎 + */ + @ApiModelProperty(value = "鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎") + private Long isDeleted; + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("projectName", getProjectName()).append("projectId", getProjectId()).append("enterpriseId", getEnterpriseId()).append("year", getYear()).append("templateRecordId", getTemplateRecordId()).append("declarationTemplateType", getDeclarationTemplateType()).append("detailId", getDetailId()).append("status", getStatus()).append("isDeleted", getIsDeleted()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark()).toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsEnterpriseBasicInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsEnterpriseBasicInfo.java new file mode 100644 index 0000000..bcfab6a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsEnterpriseBasicInfo.java @@ -0,0 +1,83 @@ +package com.ruoyi.jjh.declaration.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 浼佷笟鍩虹淇℃伅瀵硅薄 bms_enterprise_basic_info + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsEnterpriseBasicInfo extends BaseInfoEntity { + private static final long serialVersionUID = 1L; + + /** + * 涓婚敭id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 浼佷笟鍚嶇О + */ + @Excel(name = "浼佷笟鍚嶇О") + private String enterpriseName; + + /** + * 浼佷笟缁熶竴淇$敤浠g爜 + */ + @Excel(name = "浼佷笟缁熶竴淇$敤浠g爜") + private String creditCode; + + /** + * 鑱旂郴浜 + */ + @Excel(name = "鑱旂郴浜") + private String contacts; + + /** + * 鑱旂郴浜虹數璇 + */ + @Excel(name = "鑱旂郴浜虹數璇") + private String contactsNumber; + + /** + * 浼佷笟鍦板潃 + */ + @Excel(name = "浼佷笟鍦板潃") + private String address; + + /** + * 鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎 + */ + @Excel(name = "鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎") + private Long isDeleted; + + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("enterpriseName", getEnterpriseName()) + .append("creditCode", getCreditCode()) + .append("contacts", getContacts()) + .append("contactsNumber", getContactsNumber()) + .append("address", getAddress()) + .append("isDeleted", getIsDeleted()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsEnterpriseDirectory.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsEnterpriseDirectory.java new file mode 100644 index 0000000..8e98130 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsEnterpriseDirectory.java @@ -0,0 +1,50 @@ +package com.ruoyi.jjh.declaration.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 浼佷笟鍚嶅綍瀵硅薄 bms_enterprise_directory + * + * @author farben + * @date 2023-08-31 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsEnterpriseDirectory extends BaseInfoEntity { + private static final long serialVersionUID = 1L; + + /** + * 涓婚敭id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @ApiModelProperty(value = "鍦ㄧ嚎妯℃澘璁板綍id") + private Long templateRecordId; + + /** + * 浼佷笟鍚嶅瓧 + */ + @Excel(name = "浼佷笟鍚嶅瓧") + private String enterpriseName; + + /** + * 浼佷笟缁熶竴淇$敤浠g爜 + */ + @Excel(name = "浼佷笟缁熶竴淇$敤浠g爜") + private String creditCode; + + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("templateRecordId", getTemplateRecordId()).append("enterpriseName", getEnterpriseName()).append("creditCode", getCreditCode()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark()).toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsFieldInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsFieldInfo.java new file mode 100644 index 0000000..9fddff6 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsFieldInfo.java @@ -0,0 +1,93 @@ +package com.ruoyi.jjh.declaration.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 妯℃澘瀛楁濉啓璇︽儏瀵硅薄 bms_field_info + * + * @author farben + * @date 2023-09-04 + */ +public class BmsFieldInfo extends BaseInfoEntity { + private static final long serialVersionUID = 1L; + + /** + * 涓婚敭id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 璇︽儏id + */ + @Excel(name = "璇︽儏id") + private Long detailId; + + /** + * 鏂囦欢鍚嶇О + */ + @Excel(name = "鏂囦欢鍚嶇О") + private String fieldName; + + /** + * 鏂囦欢璇存槑 + */ + @Excel(name = "鏂囦欢璇存槑") + private String fieldResult; + + /** + * 鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎 + */ + @Excel(name = "鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎") + private Long isDeleted; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getDetailId() { + return detailId; + } + + public void setDetailId(Long detailId) { + this.detailId = detailId; + } + + public String getFieldName() { + return fieldName; + } + + public void setFieldName(String fieldName) { + this.fieldName = fieldName; + } + + public String getFieldResult() { + return fieldResult; + } + + public void setFieldResult(String fieldResult) { + this.fieldResult = fieldResult; + } + + public Long getIsDeleted() { + return isDeleted; + } + + public void setIsDeleted(Long isDeleted) { + this.isDeleted = isDeleted; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("detailId", getDetailId()).append("fieldName", getFieldName()).append("fieldResult", getFieldResult()).append("isDeleted", getIsDeleted()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark()).toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsFileInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsFileInfo.java new file mode 100644 index 0000000..e917232 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsFileInfo.java @@ -0,0 +1,107 @@ +package com.ruoyi.jjh.declaration.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 鏂囦欢瀛樺偍璇存槑璇︽儏瀵硅薄 bms_file_info + * + * @author farben + * @date 2023-09-04 + */ +public class BmsFileInfo extends BaseInfoEntity { + private static final long serialVersionUID = 1L; + + /** + * 涓婚敭id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 璇︽儏id + */ + @Excel(name = "璇︽儏id") + private Long detailId; + + /** + * 鏂囦欢鍚嶇О + */ + @Excel(name = "鏂囦欢鍚嶇О") + private String fileName; + + /** + * 鏂囦欢璇存槑 + */ + @Excel(name = "鏂囦欢璇存槑") + private String fileDescription; + + /** + * 鏂囦欢鍦板潃 + */ + @Excel(name = "鏂囦欢鍦板潃") + private String fileUrl; + + /** + * 鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎 + */ + @Excel(name = "鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎") + private Long isDeleted; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getDetailId() { + return detailId; + } + + public void setDetailId(Long detailId) { + this.detailId = detailId; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileDescription() { + return fileDescription; + } + + public void setFileDescription(String fileDescription) { + this.fileDescription = fileDescription; + } + + public String getFileUrl() { + return fileUrl; + } + + public void setFileUrl(String fileUrl) { + this.fileUrl = fileUrl; + } + + public Long getIsDeleted() { + return isDeleted; + } + + public void setIsDeleted(Long isDeleted) { + this.isDeleted = isDeleted; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("detailId", getDetailId()).append("fileName", getFileName()).append("fileDescription", getFileDescription()).append("fileUrl", getFileUrl()).append("isDeleted", getIsDeleted()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark()).toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsFundingDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsFundingDetail.java new file mode 100644 index 0000000..8e6b710 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsFundingDetail.java @@ -0,0 +1,145 @@ +package com.ruoyi.jjh.declaration.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 璧勯噾淇℃伅璇︽儏瀵硅薄 bms_funding_detail + * + * @author farben + * @date 2023-09-04 + */ +public class BmsFundingDetail extends BaseInfoEntity { + private static final long serialVersionUID = 1L; + + /** + * 涓婚敭id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 妯℃澘绫诲瀷锛1锛氶」鐩惤鎴峰琛ワ紝2锛氬仛澶у仛寮哄琛 + */ + @Excel(name = "妯℃澘绫诲瀷锛1锛氶」鐩惤鎴峰琛ワ紝2锛氬仛澶у仛寮哄琛") + private Integer type; + + /** + * 瀵瑰簲妯℃澘id + */ + @Excel(name = "瀵瑰簲妯℃澘id") + private int templateRecordId; + + /** + * 璇︽儏id + */ + @Excel(name = "璇︽儏id") + private Long detailId; + + private String vModel; + + /** + * 骞翠唤 + */ + @Excel(name = "骞翠唤") + private String year; + + /** + * 璇存槑 + */ + @Excel(name = "璇存槑") + private String illustrate; + + /** + * 閲戦 + */ + @Excel(name = "閲戦") + private Long amount; + + /** + * 鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎 + */ + @Excel(name = "鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎") + private Long isDeleted; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public int getTemplateRecordId() { + return templateRecordId; + } + + public void setTemplateRecordId(int templateRecordId) { + this.templateRecordId = templateRecordId; + } + + public Long getDetailId() { + return detailId; + } + + public void setDetailId(Long detailId) { + this.detailId = detailId; + } + + public String getVModel() { + return vModel; + } + + public void setVModel(String vModel) { + this.vModel = vModel; + } + + public String getYear() { + return year; + } + + public void setYear(String year) { + this.year = year; + } + + public String getIllustrate() { + return illustrate; + } + + public void setIllustrate(String illustrate) { + this.illustrate = illustrate; + } + + public Long getAmount() { + return amount; + } + + public void setAmount(Long amount) { + this.amount = amount; + } + + public Long getIsDeleted() { + return isDeleted; + } + + public void setIsDeleted(Long isDeleted) { + this.isDeleted = isDeleted; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("type", getType()).append("templateRecordId", getTemplateRecordId()).append("detailId", getDetailId()).append("vModel", getVModel()).append("year", getYear()).append("illustrate", getIllustrate()).append("amount", getAmount()).append("isDeleted", getIsDeleted()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark()).toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsIndustrialInternetAward.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsIndustrialInternetAward.java new file mode 100644 index 0000000..c874be4 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsIndustrialInternetAward.java @@ -0,0 +1,93 @@ +package com.ruoyi.jjh.declaration.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 5G+宸ヤ笟浜掕仈缃戝琛ュ璞 bms_industrial_internet_award + * + * @author farben + * @date 2023-08-25 + */ +public class BmsIndustrialInternetAward extends BaseInfoEntity { + private static final long serialVersionUID = 1L; + + /** + * 涓婚敭id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 浼佷笟id + */ + @Excel(name = "浼佷笟id") + private Long enterpriseId; + + /** + * 鑽h獕鍚嶇О + */ + @Excel(name = "鑽h獕鍚嶇О") + private String honoraryName; + + /** + * 璇佹槑鏉愭枡 + */ + @Excel(name = "璇佹槑鏉愭枡") + private String material; + + /** + * 鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎 + */ + @Excel(name = "鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎") + private Long isDeleted; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getEnterpriseId() { + return enterpriseId; + } + + public void setEnterpriseId(Long enterpriseId) { + this.enterpriseId = enterpriseId; + } + + public String getHonoraryName() { + return honoraryName; + } + + public void setHonoraryName(String honoraryName) { + this.honoraryName = honoraryName; + } + + public String getMaterial() { + return material; + } + + public void setMaterial(String material) { + this.material = material; + } + + public Long getIsDeleted() { + return isDeleted; + } + + public void setIsDeleted(Long isDeleted) { + this.isDeleted = isDeleted; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("enterpriseId", getEnterpriseId()).append("honoraryName", getHonoraryName()).append("material", getMaterial()).append("isDeleted", getIsDeleted()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark()).toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsIntegrationIndustries.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsIntegrationIndustries.java new file mode 100644 index 0000000..d9425d0 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsIntegrationIndustries.java @@ -0,0 +1,96 @@ +package com.ruoyi.jjh.declaration.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 涓や笟铻嶅悎濂栬ˉ瀵硅薄 bms_integration_industries + * + * @author farben + * @date 2023-09-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsIntegrationIndustries extends BaseInfoEntity { + private static final long serialVersionUID = 1L; + + /** + * 涓婚敭id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 浼佷笟id + */ + @Excel(name = "浼佷笟id") + private Long enterpriseId; + + @Excel(name = "鐢虫姤绫诲瀷", readConverterExp = "1=涓や笟铻嶅悎绀鸿寖浼佷笟,2=鍒堕犱笟浼佷笟璁剧珛璐㈠姟鐙珛鏍哥畻鐨勫埗閫犳湇鍔′笟鑱岃兘閮ㄩ棬,3=鍒堕犱笟浼佷笟鍓ョ鏈嶅姟涓氬姟鎴愮珛鐙珛鐨勬硶浜") + private Integer declarationType; + + /** + * 璇佹槑鏉愭枡 + */ + @Excel(name = "璇佹槑鏉愭枡") + private String evidence; + + /** + * 钀ヤ笟鎵х収 + */ + @Excel(name = "钀ヤ笟鎵х収") + private String businessLicense; + + /** + * 瀹岀◣璇佹槑 + */ + @Excel(name = "瀹岀◣璇佹槑") + private String taxPaymentCertificate; + + /** + * 瀹¤鎶ュ憡 + */ + @Excel(name = "瀹¤鎶ュ憡") + private String auditReport; + + /** + * 鑲℃潈鏋舵瀯鍥 + */ + @Excel(name = "鑲℃潈鏋舵瀯鍥") + private String equityStructureChart; + + /** + * 椤圭洰鐢虫姤鎶ュ憡锛堝惈浼佷笟鍩烘湰鎯呭喌鍜岄」鐩熀鏈儏鍐碉級 + */ + @Excel(name = "椤圭洰鐢虫姤鎶ュ憡", readConverterExp = "鍚=浼佷笟鍩烘湰鎯呭喌鍜岄」鐩熀鏈儏鍐") + private String declarationReport; + + /** + * 鐙珛鏍哥畻鐩稿叧璇佹槑 + */ + @Excel(name = "鐙珛鏍哥畻鐩稿叧璇佹槑") + private String independentAccounting; + + /** + * 楠岃祫鎶ュ憡 + */ + @Excel(name = "楠岃祫鎶ュ憡") + private String capitalVerificationReport; + + /** + * 璇佹槑鏉愭枡 + */ + @Excel(name = "璇佹槑鏉愭枡") + private String otherEvidence; + + /** + * 鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎 + */ + @Excel(name = "鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎") + private Long isDeleted; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsLogisticsDevelopmentAward.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsLogisticsDevelopmentAward.java new file mode 100644 index 0000000..b7eb472 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsLogisticsDevelopmentAward.java @@ -0,0 +1,121 @@ +package com.ruoyi.jjh.declaration.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 鐗╂祦鍙戝睍濂栬ˉ瀵硅薄 bms_logistics_development_award + * + * @author farben + * @date 2023-08-25 + */ +public class BmsLogisticsDevelopmentAward extends BaseInfoEntity { + private static final long serialVersionUID = 1L; + + /** + * 涓婚敭id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 浼佷笟id + */ + @Excel(name = "浼佷笟id") + private Long enterpriseId; + + /** + * 鑽h獕璇佹槑鏂囦欢 + */ + @Excel(name = "鑽h獕璇佹槑鏂囦欢") + private String honorCertificate; + + /** + * 骞冲彴鍚嶇О + */ + @Excel(name = "骞冲彴鍚嶇О") + private String platformName; + + /** + * 浼佷笟鎶曡祫椤圭洰澶囨閫氱煡涔︽垨鏍稿噯鎵瑰鏂囦欢 + */ + @Excel(name = "浼佷笟鎶曡祫椤圭洰澶囨閫氱煡涔︽垨鏍稿噯鎵瑰鏂囦欢") + private String filingNotice; + + /** + * 浼氳甯堜簨鍔℃墍鍑哄叿鐨勪紒涓氳储鍔℃姤琛ㄥ璁℃姤鍛 + */ + @Excel(name = "浼氳甯堜簨鍔℃墍鍑哄叿鐨勪紒涓氳储鍔℃姤琛ㄥ璁℃姤鍛") + private String auditReport; + + /** + * 鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎 + */ + @Excel(name = "鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎") + private Long isDeleted; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getEnterpriseId() { + return enterpriseId; + } + + public void setEnterpriseId(Long enterpriseId) { + this.enterpriseId = enterpriseId; + } + + public String getHonorCertificate() { + return honorCertificate; + } + + public void setHonorCertificate(String honorCertificate) { + this.honorCertificate = honorCertificate; + } + + public String getPlatformName() { + return platformName; + } + + public void setPlatformName(String platformName) { + this.platformName = platformName; + } + + public String getFilingNotice() { + return filingNotice; + } + + public void setFilingNotice(String filingNotice) { + this.filingNotice = filingNotice; + } + + public String getAuditReport() { + return auditReport; + } + + public void setAuditReport(String auditReport) { + this.auditReport = auditReport; + } + + public Long getIsDeleted() { + return isDeleted; + } + + public void setIsDeleted(Long isDeleted) { + this.isDeleted = isDeleted; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("enterpriseId", getEnterpriseId()).append("honorCertificate", getHonorCertificate()).append("platformName", getPlatformName()).append("filingNotice", getFilingNotice()).append("auditReport", getAuditReport()).append("isDeleted", getIsDeleted()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark()).toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsManufacturingServicesAward.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsManufacturingServicesAward.java new file mode 100644 index 0000000..2f8e6ad --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsManufacturingServicesAward.java @@ -0,0 +1,121 @@ +package com.ruoyi.jjh.declaration.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ瀵硅薄 bms_manufacturing_services_award + * + * @author farben + * @date 2023-08-25 + */ +public class BmsManufacturingServicesAward extends BaseInfoEntity { + private static final long serialVersionUID = 1L; + + /** + * 涓婚敭id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 浼佷笟id + */ + @Excel(name = "浼佷笟id") + private Long enterpriseId; + + /** + * 浼佷笟鎶曡祫椤圭洰澶囨閫氱煡涔︽垨鏍稿噯鎵瑰鏂囦欢 + */ + @Excel(name = "浼佷笟鎶曡祫椤圭洰澶囨閫氱煡涔︽垨鏍稿噯鎵瑰鏂囦欢") + private String filingNotice; + + /** + * 璐疆璁惧鍙戠エ娓呭崟鍙婂彂绁ㄦ壂鎻忎欢 + */ + @Excel(name = "璐疆璁惧鍙戠エ娓呭崟鍙婂彂绁ㄦ壂鎻忎欢") + private String invoice; + + /** + * 浼氳甯堜簨鍔℃墍鍑哄叿鐨勪紒涓氱敵鎶ラ」鐩喘缃澶囨儏鍐电殑涓撻」瀹¤鎶ュ憡 + */ + @Excel(name = "浼氳甯堜簨鍔℃墍鍑哄叿鐨勪紒涓氱敵鎶ラ」鐩喘缃澶囨儏鍐电殑涓撻」瀹¤鎶ュ憡") + private String auditReport; + + /** + * 浼氳甯堜簨鍔℃墍鍑哄叿鐨勪紒涓氳储鍔℃姤琛ㄥ璁℃姤鍛 + */ + @Excel(name = "浼氳甯堜簨鍔℃墍鍑哄叿鐨勪紒涓氳储鍔℃姤琛ㄥ璁℃姤鍛") + private String financialStatements; + + /** + * 鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎 + */ + @Excel(name = "鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎") + private Long isDeleted; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getEnterpriseId() { + return enterpriseId; + } + + public void setEnterpriseId(Long enterpriseId) { + this.enterpriseId = enterpriseId; + } + + public String getFilingNotice() { + return filingNotice; + } + + public void setFilingNotice(String filingNotice) { + this.filingNotice = filingNotice; + } + + public String getInvoice() { + return invoice; + } + + public void setInvoice(String invoice) { + this.invoice = invoice; + } + + public String getAuditReport() { + return auditReport; + } + + public void setAuditReport(String auditReport) { + this.auditReport = auditReport; + } + + public String getFinancialStatements() { + return financialStatements; + } + + public void setFinancialStatements(String financialStatements) { + this.financialStatements = financialStatements; + } + + public Long getIsDeleted() { + return isDeleted; + } + + public void setIsDeleted(Long isDeleted) { + this.isDeleted = isDeleted; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("enterpriseId", getEnterpriseId()).append("filingNotice", getFilingNotice()).append("invoice", getInvoice()).append("auditReport", getAuditReport()).append("financialStatements", getFinancialStatements()).append("isDeleted", getIsDeleted()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsPlatformConstructionAward.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsPlatformConstructionAward.java new file mode 100644 index 0000000..d449dbf --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsPlatformConstructionAward.java @@ -0,0 +1,93 @@ +package com.ruoyi.jjh.declaration.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 骞冲彴寤鸿濂栬ˉ瀵硅薄 bms_platform_construction_award + * + * @author farben + * @date 2023-08-25 + */ +public class BmsPlatformConstructionAward extends BaseInfoEntity { + private static final long serialVersionUID = 1L; + + /** + * 涓婚敭id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 浼佷笟id + */ + @Excel(name = "浼佷笟id") + private Long enterpriseId; + + /** + * 骞冲彴锛堥」鐩級鍚嶇О + */ + @Excel(name = "骞冲彴锛堥」鐩級鍚嶇О") + private String platformName; + + /** + * 鍚堜綔鍗忚 + */ + @Excel(name = "鍚堜綔鍗忚") + private String agreement; + + /** + * 鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎 + */ + @Excel(name = "鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎") + private Long isDeleted; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getEnterpriseId() { + return enterpriseId; + } + + public void setEnterpriseId(Long enterpriseId) { + this.enterpriseId = enterpriseId; + } + + public String getPlatformName() { + return platformName; + } + + public void setPlatformName(String platformName) { + this.platformName = platformName; + } + + public String getAgreement() { + return agreement; + } + + public void setAgreement(String agreement) { + this.agreement = agreement; + } + + public Long getIsDeleted() { + return isDeleted; + } + + public void setIsDeleted(Long isDeleted) { + this.isDeleted = isDeleted; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("enterpriseId", getEnterpriseId()).append("platformName", getPlatformName()).append("agreement", getAgreement()).append("isDeleted", getIsDeleted()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark()).toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsProcessInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsProcessInfo.java new file mode 100644 index 0000000..c74e585 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsProcessInfo.java @@ -0,0 +1,73 @@ +package com.ruoyi.jjh.declaration.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 瀹℃壒娴佺▼瀵硅薄 bms_process_info + * + * @author farben + * @date 2023-09-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsProcessInfo extends BaseInfoEntity { + private static final long serialVersionUID = 1L; + + /** + * 涓婚敭id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 瀵瑰簲瀹℃壒绫诲瀷(0=鎵鏈夎瘎瀹) + */ + @Excel(name = "瀵瑰簲瀹℃壒绫诲瀷(0=鎵鏈夎瘎瀹)") + private Integer approvalType; + + /** + * 瀵瑰簲瀹℃壒灞傜骇(0=鍒濆,1=澶嶅,2=涓撳璇勫,3=甯傜骇璇勫) + */ + @Excel(name = "瀵瑰簲瀹℃壒灞傜骇(0=鍒濆,1=澶嶅,2=涓撳璇勫,3=甯傜骇璇勫)") + private Integer approvalLevel; + + @Excel(name = "瀹℃壒閮ㄩ棬id") + private Long approvalDept; + + /** + * 瀹℃壒浜篿d + */ + @Excel(name = "榛樿瀹℃壒浜篿d") + private Long approvalById; + + @Excel(name = "瀹℃壒浜猴紙鍙兘鏈夊涓級") + private String approvalByIds; + + @Excel(name = "涓嬩竴涓鎵筰d锛岀粨鏉熶负0") + private Long nextProcessId; + + /** + * 鎺掑簭 + */ + @Excel(name = "鎺掑簭") + private Integer sort; + + /** + * 鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎 + */ + @Excel(name = "鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎") + private Integer isDeleted; + + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("approvalType", getApprovalType()).append("approvalLevel", getApprovalLevel()).append("approvalById", getApprovalById()).append("approvalByIds", getApprovalByIds()).append("nextProcessId", getNextProcessId()).append("sort", getSort()).append("isDeleted", getIsDeleted()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark()).toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsProjectInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsProjectInfo.java new file mode 100644 index 0000000..e28af5f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsProjectInfo.java @@ -0,0 +1,98 @@ +package com.ruoyi.jjh.declaration.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 椤圭洰鍩烘湰淇℃伅瀵硅薄 bms_project_info + * + * @author farben + * @date 2023-09-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsProjectInfo extends BaseInfoEntity { + private static final long serialVersionUID = 1L; + + /** + * 涓婚敭id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @Excel(name = "鐢虫姤妯$増绫诲瀷") + private Integer declarationTemplateType; + + /** + * 椤圭洰鍚嶇О + */ + @Excel(name = "椤圭洰鍚嶇О") + private String projectName; + + /** + * 鐢虫姤鍗曚綅,浼佷笟id + */ + @Excel(name = "鐢虫姤鍗曚綅,浼佷笟id") + private Long enterpriseId; + + /** + * 浜у搧棰嗗煙(0=绉戞妧棰嗗煙,1=淇℃伅鎶鏈湇鍔,2=鐭ヨ瘑浜ф潈鏈嶅姟,3=妫楠屾娴嬫湇鍔,4=鏂囧寲鍒涙剰,5=绉戞妧鏈嶅姟,6=涓や笟铻嶅悎鍙戝睍銆愮鎶鏈嶅姟銆,7=涓や笟铻嶅悎鍙戝睍銆愬叏浜т笟閾惧伐涓氳璁) + */ + @Excel(name = "浜у搧棰嗗煙(0=绉戞妧棰嗗煙,1=淇℃伅鎶鏈湇鍔,2=鐭ヨ瘑浜ф潈鏈嶅姟,3=妫楠屾娴嬫湇鍔,4=鏂囧寲鍒涙剰,5=绉戞妧鏈嶅姟,6=涓や笟铻嶅悎鍙戝睍銆愮鎶鏈嶅姟銆,7=涓や笟铻嶅悎鍙戝睍銆愬叏浜т笟閾惧伐涓氳璁)") + private Long productArea; + + /** + * 骞翠唤 + */ + @Excel(name = "骞翠唤") + private String year; + + /** + * 椤圭洰寮濮嬫椂闂 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "椤圭洰寮濮嬫椂闂", width = 30, dateFormat = "yyyy-MM-dd") + private Date startTime; + + /** + * 椤圭洰缁撴潫鏃堕棿 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "椤圭洰缁撴潫鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd") + private Date endTime; + + /** + * 鐢虫姤绔e伐鏃堕棿 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "鐢虫姤绔e伐鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd") + private Date completionTime; + + /** + * 鎵舵寔鏂瑰紡(0=鎶曡祫琛ュ姪) + */ + @Excel(name = "鎵舵寔鏂瑰紡(0=鎶曡祫琛ュ姪)") + private Long supportMethods; + + /** + * 鐢虫姤鏃堕棿 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "鐢虫姤鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd") + private Date declarationTime; + + /** + * 鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎 + */ + @Excel(name = "鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎") + private Long isDeleted; + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsProjectSettlementAward.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsProjectSettlementAward.java new file mode 100644 index 0000000..c404576 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsProjectSettlementAward.java @@ -0,0 +1,86 @@ +package com.ruoyi.jjh.declaration.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; + +/** + * 椤圭洰钀芥埛濂栬ˉ瀵硅薄 bms_project_settlement_award + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsProjectSettlementAward extends BaseInfoEntity { + + private static final long serialVersionUID = 1L; + + /** + * 涓婚敭id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 浼佷笟id + */ + @Excel(name = "浼佷笟id") + private Long enterpriseId; + + /** + * 鐢虫姤鍗曚綅鎴愮珛鏃堕棿 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "鐢虫姤鍗曚綅鎴愮珛鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd") + private Date establishTime; + + /** + * 鎴嚦鐩墠鍛樺伐浜烘暟 + */ + @Excel(name = "鎴嚦鐩墠鍛樺伐浜烘暟") + private Long employeeNum; + + /** + * 鎷涘晢鍗忚 + */ + @Excel(name = "鎷涘晢鍗忚") + private String agreement; + + /** + * 楠岃祫鎶ュ憡 + */ + @Excel(name = "楠岃祫鎶ュ憡") + private String report; + + /** + * 钀ヤ笟鎵х収 + */ + @Excel(name = "钀ヤ笟鎵х収") + private String businessLicense; + + /** + * 鍏朵粬鏉愭枡 + */ + @Excel(name = "鍏朵粬鏉愭枡") + private String otherMaterials; + + /** + * 鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎 + */ + @Excel(name = "鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎") + private Long isDeleted; + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("enterpriseId", getEnterpriseId()).append("establishTime", getEstablishTime()).append("employeeNum", getEmployeeNum()).append("agreement", getAgreement()).append("report", getReport()).append("businessLicense", getBusinessLicense()).append("otherMaterials", getOtherMaterials()).append("isDeleted", getIsDeleted()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsSceneOpeningAward.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsSceneOpeningAward.java new file mode 100644 index 0000000..9607390 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsSceneOpeningAward.java @@ -0,0 +1,64 @@ +package com.ruoyi.jjh.declaration.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 鍦烘櫙寮鏀惧琛ュ璞 bms_scene_opening_award + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsSceneOpeningAward extends BaseInfoEntity { + private static final long serialVersionUID = 1L; + + /** + * 涓婚敭id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 浼佷笟id + */ + @Excel(name = "浼佷笟id") + private Long enterpriseId; + + /** + * 椤圭洰鍚嶇О + */ + @Excel(name = "椤圭洰鍚嶇О") + private String projectName; + + /** + * 鎵灞炵被鍨 + */ + @Excel(name = "鎵灞炵被鍨") + private Long type; + + /** + * 鍏ず銆佸彂鏂囪瘉鏄庛佷笓瀹惰瘎鍒嗚〃 + */ + @Excel(name = "鍏ず銆佸彂鏂囪瘉鏄庛佷笓瀹惰瘎鍒嗚〃") + private String material; + + /** + * 鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎 + */ + @Excel(name = "鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎") + private Long isDeleted; + + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("enterpriseId", getEnterpriseId()).append("projectName", getProjectName()).append("type", getType()).append("material", getMaterial()).append("isDeleted", getIsDeleted()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark()).toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsTemplateInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsTemplateInfo.java new file mode 100644 index 0000000..fe503b8 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsTemplateInfo.java @@ -0,0 +1,144 @@ +package com.ruoyi.jjh.declaration.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import io.swagger.annotations.ApiModelProperty; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 鐢虫姤妯℃澘淇℃伅瀵硅薄 bms_template_info + * + * @author farben + * @date 2023-08-25 + */ +public class BmsTemplateInfo extends BaseInfoEntity { + private static final long serialVersionUID = 1L; + + /** + * 涓婚敭id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 妯℃澘鍚嶇О + */ + @ApiModelProperty(value = "妯℃澘鍚嶇О") + @Excel(name = "妯℃澘鍚嶇О") + private String templateName; + + + /** + * 绾у埆 0:鏈骇,1:鐪佺骇 + */ + @ApiModelProperty(value = "绾у埆 0:鏈骇,1:鐪佺骇") + @Excel(name = "绾у埆 ", readConverterExp = "0=鏈骇,1=鐪佺骇") + private Long level; + + /** + * 浜у搧棰嗗煙 鐢熶骇鎬ф湇鍔′笟 鐜颁唬鏈嶅姟涓 鏂板叴鏈嶅姟涓 + */ + @ApiModelProperty(value = "浜у搧棰嗗煙 0:鐢熶骇鎬ф湇鍔′笟 1:鐜颁唬鏈嶅姟涓 2:鏂板叴鏈嶅姟涓") + @Excel(name = "浜у搧棰嗗煙", readConverterExp = "0=鐢熶骇鎬ф湇鍔′笟,1=鐜颁唬鏈嶅姟涓,2=鏂板叴鏈嶅姟涓") + private Long productArea; + + /** + * 鐢虫姤绫诲瀷 0:/, 1:璇曠偣鍖哄煙,2:榫欏ご鍨,3:鍒涙柊鍨 + */ + @ApiModelProperty(value = "鐢虫姤绫诲瀷 0:/, 1:璇曠偣鍖哄煙,2:榫欏ご鍨,3:鍒涙柊鍨") + @Excel(name = "鐢虫姤绫诲瀷", readConverterExp = "0=/, 1=璇曠偣鍖哄煙,2=榫欏ご鍨,3=鍒涙柊鍨") + private Long type; + + /** + * 琛ㄥ崟璇存槑 + */ + @ApiModelProperty(value = "琛ㄥ崟璇存槑") + @Excel(name = "琛ㄥ崟璇存槑") + private String notes; + + /** + * 璐d换鍗曚綅 0锛氱粡鍙戝:1锛氳寤哄:2锛氳瀹″眬:3锛氬競鐩戝眬 + */ + @ApiModelProperty(value = "璐d换鍗曚綅 0锛氱粡鍙戝:1锛氳寤哄:2锛氳瀹″眬:3锛氬競鐩戝眬") + @Excel(name = "璐d换鍗曚綅", readConverterExp = "0=缁忓彂濮,1=瑙勫缓濮,2=琛屽灞,3=甯傜洃灞") + private Long responsibilityUnit; + + /** + * 鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎 + */ + @ApiModelProperty(value = "鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎") + @Excel(name = "鏄惁鍒犻櫎", readConverterExp = "0=鏈垹闄,1=宸插垹闄") + private Long isDeleted; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public Long getLevel() { + return level; + } + + public void setLevel(Long level) { + this.level = level; + } + + public Long getProductArea() { + return productArea; + } + + public void setProductArea(Long productArea) { + this.productArea = productArea; + } + + public Long getType() { + return type; + } + + public void setType(Long type) { + this.type = type; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public Long getResponsibilityUnit() { + return responsibilityUnit; + } + + public void setResponsibilityUnit(Long responsibilityUnit) { + this.responsibilityUnit = responsibilityUnit; + } + + public Long getIsDeleted() { + return isDeleted; + } + + public void setIsDeleted(Long isDeleted) { + this.isDeleted = isDeleted; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("templateName", getTemplateName()).append("level", getLevel()).append("productArea", getProductArea()).append("type", getType()).append("notes", getNotes()).append("responsibilityUnit", getResponsibilityUnit()).append("isDeleted", getIsDeleted()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark()).toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsTemplateRecord.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsTemplateRecord.java new file mode 100644 index 0000000..812aef4 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsTemplateRecord.java @@ -0,0 +1,75 @@ +package com.ruoyi.jjh.declaration.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.Size; +import java.util.Date; + +/** + * 鍦ㄧ嚎妯℃澘瀵硅薄 bms_template_record + * + * @author farben + * @date 2023-09-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsTemplateRecord extends BaseInfoEntity { + private static final long serialVersionUID = 1L; + + /** + * 涓婚敭id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 妯$増id + */ + @Excel(name = "妯$増id") + private Long templateId; + + /** + * 浼佷笟鍚嶅綍鍒嗙被 + */ + @ApiModelProperty(value = "浼佷笟鍚嶅綍鍒嗙被") + @Excel(name = "浼佷笟鍚嶅綍鍒嗙被") + private String enterpriseDirectory; + + /** + * 寮鏀惧紑濮嬫椂闂 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "寮鏀惧紑濮嬫椂闂", width = 30, dateFormat = "yyyy-MM-dd") + private Date startTime; + + /** + * 寮鏀剧粨鏉熸椂闂 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "寮鏀剧粨鏉熸椂闂", width = 30, dateFormat = "yyyy-MM-dd") + private Date endTime; + + @Excel(name = "涓婁紶鏂囦欢鍚嶇О") + private String fileName; + + /** + * 鐢虫姤閫斿緞 0:绯荤粺鐢虫姤锛1:琛ュ綍 + */ + @Excel(name = "鐢虫姤閫斿緞 0:绯荤粺鐢虫姤锛1:琛ュ綍") + private Long road; + + /** + * 璇存槑 + */ + @Excel(name = "璇存槑") + @Size(max = 200, message = "璇存槑鐨勯暱搴﹁灏忎簬 200") + private String notes; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BsmFundingInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BsmFundingInfo.java new file mode 100644 index 0000000..e8cd9c2 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BsmFundingInfo.java @@ -0,0 +1,110 @@ +package com.ruoyi.jjh.declaration.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; + +/** + * 璧勯噾淇℃伅瀵硅薄 bsm_funding_info + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BsmFundingInfo extends BaseInfoEntity { + private static final long serialVersionUID = 1L; + + /** + * 涓婚敭id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 妯℃澘绫诲瀷锛1锛氶」鐩惤鎴峰琛ワ紝2锛氬仛澶у仛寮哄琛 + */ + @Excel(name = "妯℃澘绫诲瀷锛1锛氶」鐩惤鎴峰琛ワ紝2锛氬仛澶у仛寮哄琛") + private Integer type; + + /** + * 瀵瑰簲妯℃澘id + */ + @Excel(name = "瀵瑰簲妯℃澘id") + private Long templateId; + + @ApiModelProperty(value = "璇︽儏id") + private Long detailId; + + /** + * 钀ユ敹骞翠唤 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "钀ユ敹骞翠唤", width = 30, dateFormat = "yyyy-MM-dd") + private Date revenueYear; + + /** + * 钀ユ敹 + */ + @Excel(name = "钀ユ敹") + private Long revenue; + + /** + * 绋庢敹骞翠唤 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "绋庢敹骞翠唤", width = 30, dateFormat = "yyyy-MM-dd") + private Date taxationYear; + + /** + * 绋庢敹 + */ + @Excel(name = "绋庢敹") + private Long taxation; + + /** + * 棰勮钀ユ敹骞翠唤 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "棰勮钀ユ敹骞翠唤", width = 30, dateFormat = "yyyy-MM-dd") + private Date expectedRevenueYear; + + /** + * 棰勮钀ユ敹 + */ + @Excel(name = "棰勮钀ユ敹") + private Long expectedRevenue; + + /** + * 棰勮绋庢敹骞翠唤 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "棰勮绋庢敹骞翠唤", width = 30, dateFormat = "yyyy-MM-dd") + private Date expectedTaxationYear; + + /** + * 棰勮绋庢敹 + */ + @Excel(name = "棰勮绋庢敹") + private Long expectedTaxation; + + /** + * 鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎 + */ + @Excel(name = "鏄惁鍒犻櫎锛0锛屾湭鍒犻櫎锛1锛屽凡鍒犻櫎") + private Long isDeleted; + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("type", getType()).append("templateId", getTemplateId()).append("revenueYear", getRevenueYear()).append("revenue", getRevenue()).append("taxationYear", getTaxationYear()).append("taxation", getTaxation()).append("expectedRevenueYear", getExpectedRevenueYear()).append("expectedRevenue", getExpectedRevenue()).append("expectedTaxationYear", getExpectedTaxationYear()).append("expectedTaxation", getExpectedTaxation()).append("isDeleted", getIsDeleted()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark()).toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/AppendixParamDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/AppendixParamDto.java new file mode 100644 index 0000000..7817e63 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/AppendixParamDto.java @@ -0,0 +1,29 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import lombok.Data; + +/** + *

+ * 闄勪欢鍙傛暟dto + *

+ * + * @className: AppendixParamDto + * @author: emiya.xie + * @create: 2023-03-03 10:46 + */ +@Data +public class AppendixParamDto { + + /** + * 闄勪欢id + */ + private Long id; + /** + * 鍏朵粬 + */ + private String name; + /** + * 鏂囦欢鍚嶇О + */ + private String deliverablesName; +} \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/ApprovalDeclarationRecordsQueryDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/ApprovalDeclarationRecordsQueryDto.java new file mode 100644 index 0000000..5389f27 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/ApprovalDeclarationRecordsQueryDto.java @@ -0,0 +1,56 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + *

+ * 瀹℃牳鐢虫姤璁板綍鏌ヨ + *

+ * + * @className: ApprovalDeclarationRecordsQueryDto + * @author: emiya.xie + * @create: 2023-09-09 15:07 + */ +@Data +public class ApprovalDeclarationRecordsQueryDto implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "浜嬮」") + private String matter; + + @ApiModelProperty(value = "椤圭洰鍚嶇О") + private String projectName; + + @ApiModelProperty(value = "椤圭洰绫诲瀷锛氫篃灏辨槸浜у搧棰嗗煙") + private Integer productArea; + + @ApiModelProperty(value = "鐢虫姤鍗曚綅") + private String enterpriseName; + + @ApiModelProperty(value = "鎵舵寔鏂瑰紡") + private Integer supportMethods; + + @ApiModelProperty(value = "椤圭洰寮濮嬫椂闂") + private Date startTime; + + @ApiModelProperty(value = "椤圭洰缁撴潫鏃堕棿") + private Date endTime; + + @ApiModelProperty(value = "瀹℃牳鐘舵") + private Integer status; + + @ApiModelProperty(value = "鐢ㄦ埛id") + private List userIds; + + @ApiModelProperty(value = "瀹℃壒浜篿d") + private Long approvalById; + + @ApiModelProperty(value = "瀹℃壒鐘舵侀泦鍚") + private List approvalStatusStr; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsApprovalInfoUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsApprovalInfoUpdateDto.java new file mode 100644 index 0000000..f925a86 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsApprovalInfoUpdateDto.java @@ -0,0 +1,43 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; + +/** + * 瀹℃壒璁板綍淇℃伅瀵硅薄 bms_approval_info + * + * @author farben + * @date 2023-09-09 + */ +@Data +public class BmsApprovalInfoUpdateDto implements Serializable { + private static final long serialVersionUID = 1L; + + /** 涓婚敭id */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** 鐢虫姤璁板綍id */ + @Excel(name = "鐢虫姤璁板綍id") + private Long declarationRecordsId; + + /** 瀹℃壒鐘舵(0=寰呭鏍.1=瀹℃壒閫氳繃,2=瀹℃壒椹冲洖) */ + @Excel(name = "瀹℃壒鐘舵(0=寰呭鏍.1=瀹℃壒閫氳繃,2=瀹℃壒椹冲洖)") + private Integer approvalStatus; + + /** 瀹℃壒鎰忚 */ + @Excel(name = "瀹℃壒鎰忚") + private String approvalOpinions; + + /** 瀹℃壒闄勪欢 */ + @Excel(name = "瀹℃壒闄勪欢") + private String approvalAttachment; + + @Excel(name = "鎺掑簭") + private Integer sort; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBigStrongAwardAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBigStrongAwardAddDto.java new file mode 100644 index 0000000..a9125ed --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBigStrongAwardAddDto.java @@ -0,0 +1,44 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 鍋氬ぇ鍋氬己濂栬鎯呭璞 bms_big_strong_award + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsBigStrongAwardAddDto extends BmsEnterpriseBasicInfoAddDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** 鎴愮珛鏃堕棿 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "鎴愮珛鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd") + private Date establishTime; + + /** 鏄惁鑾峰緱鍥尯鍏朵粬缁忚惀濂栧姳 */ + @Excel(name = "鏄惁鑾峰緱鍥尯鍏朵粬缁忚惀濂栧姳锛0锛氭槸锛1锛氬惁",readConverterExp = "0=鏄,1=鍚") + private int isGainRewards; + + @Excel(name = "濂栧姳璇存槑") + private String rewardDescription; + + @ApiModelProperty(value = "搴旀敹鍒楄〃") + private List fundingDetailList; + + /** 浼佷笟杩3骞村彂灞曟儏鍐靛強鏈潵鍙戝睍璁″垝 */ + @Excel(name = "浼佷笟杩3骞村彂灞曟儏鍐靛強鏈潵鍙戝睍璁″垝") + private String developmentPlan; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBigStrongAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBigStrongAwardUpdateDto.java new file mode 100644 index 0000000..c48054a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBigStrongAwardUpdateDto.java @@ -0,0 +1,38 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.jjh.declaration.entity.BmsBigStrongAward; +import com.ruoyi.jjh.declaration.entity.BmsFundingDetail; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.List; + +/** + * 鍋氬ぇ鍋氬己濂栬鎯呭璞 bms_big_strong_award + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsBigStrongAwardUpdateDto extends BmsBigStrongAward implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "璁板綍id") + private Long declarationRecordsId; + + @ApiModelProperty(value = "搴旀敹鍒楄〃") + private List fundingDetailList; + + @ApiModelProperty(value = "椤圭洰鍚嶇О") + private String projectName; + + @ApiModelProperty(value = "椤圭洰id") + private Long projectId; + + @ApiModelProperty(value = "瀹℃壒鐘舵:0=鑽夌ǹ,1=鍒濆涓,2=澶嶅涓,3=涓撳璇勫涓,4=甯傜骇璇勫畾涓,5=璇勫畾閫氳繃,6=涓撳璇勫-鎷掔粷,7=澶嶅-鎷掔粷,8=鍒濆-鎷掔粷,9=璇勫畾椹冲洖") + private Long status; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBrandingAwardAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBrandingAwardAddDto.java new file mode 100644 index 0000000..b96d8e5 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBrandingAwardAddDto.java @@ -0,0 +1,34 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * 鍝佺墝鎵撻犲琛ュ璞 bms_branding_award + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsBrandingAwardAddDto extends BmsEnterpriseBasicInfoAddDto implements Serializable { + + private static final long serialVersionUID = 1L; + + + /** 鎵鑾疯崳瑾/鎵涓惧姙娲诲姩 */ + @Excel(name = "鎵鑾疯崳瑾/鎵涓惧姙娲诲姩") + private String honorsReceived; + + /** 鎵灞炵瓑绾 */ + @Excel(name = "鎵灞炵瓑绾") + private Long level; + + /** 璇佹槑鏉愭枡 */ + @Excel(name = "璇佹槑鏉愭枡") + private String evidence; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBrandingAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBrandingAwardUpdateDto.java new file mode 100644 index 0000000..ec9dbb7 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBrandingAwardUpdateDto.java @@ -0,0 +1,31 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.jjh.declaration.entity.BmsBrandingAward; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 鍝佺墝鎵撻犲琛ュ璞 bms_branding_award + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsBrandingAwardUpdateDto extends BmsBrandingAward { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "璁板綍id") + private Long declarationRecordsId; + + @ApiModelProperty(value = "椤圭洰鍚嶇О") + private String projectName; + + @ApiModelProperty(value = "椤圭洰id") + private Long projectId; + + @ApiModelProperty(value = "瀹℃壒鐘舵:0=鑽夌ǹ,1=鍒濆涓,2=澶嶅涓,3=涓撳璇勫涓,4=甯傜骇璇勫畾涓,5=璇勫畾閫氳繃,6=涓撳璇勫-鎷掔粷,7=澶嶅-鎷掔粷,8=鍒濆-鎷掔粷,9=璇勫畾椹冲洖") + private Long status; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCarrierConstructionAwardAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCarrierConstructionAwardAddDto.java new file mode 100644 index 0000000..e6c9ffd --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCarrierConstructionAwardAddDto.java @@ -0,0 +1,45 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * 杞戒綋寤鸿濂栬ˉ瀵硅薄 bms_carrier_construction_award + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsCarrierConstructionAwardAddDto extends BmsEnterpriseBasicInfoAddDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** 鏂囦綋浼佷笟鏁伴噺鍗犳瘮 */ + @Excel(name = "鏂囦綋浼佷笟鏁伴噺鍗犳瘮") + private String quantityProportion; + + /** 鏂囦綋浼佷笟钀ユ敹鍗犳瘮 */ + @Excel(name = "鏂囦綋浼佷笟钀ユ敹鍗犳瘮") + private String revenueProportion; + + /** 鏂囦綋浼佷笟浠庝笟浜哄憳鍗犳瘮 */ + @Excel(name = "鏂囦綋浼佷笟浠庝笟浜哄憳鍗犳瘮") + private String personnelProportion; + + /** 鐩稿叧浣愯瘉鏉愭枡 */ + @Excel(name = "鐩稿叧浣愯瘉鏉愭枡") + private String supportingMaterials; + + /** 椤圭洰宸ュ晢鐧昏璁稿彲 */ + @Excel(name = "椤圭洰宸ュ晢鐧昏璁稿彲") + private String businessLicense; + + /** 娑堥槻楠屾敹鎶ュ憡 */ + @Excel(name = "娑堥槻楠屾敹鎶ュ憡") + private String fireReport; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCarrierConstructionAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCarrierConstructionAwardUpdateDto.java new file mode 100644 index 0000000..3ff45b2 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCarrierConstructionAwardUpdateDto.java @@ -0,0 +1,29 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.declaration.entity.BmsCarrierConstructionAward; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 杞戒綋寤鸿濂栬ˉ瀵硅薄 bms_carrier_construction_award + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsCarrierConstructionAwardUpdateDto extends BmsCarrierConstructionAward { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "璁板綍id") + private Long declarationRecordsId; + + @Excel(name = "椤圭洰id") + private Long projectId; + + @ApiModelProperty(value = "瀹℃壒鐘舵:0=鑽夌ǹ,1=鍒濆涓,2=澶嶅涓,3=涓撳璇勫涓,4=甯傜骇璇勫畾涓,5=璇勫畾閫氳繃,6=涓撳璇勫-鎷掔粷,7=澶嶅-鎷掔粷,8=鍒濆-鎷掔粷,9=璇勫畾椹冲洖") + private Long status; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCreditManagementAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCreditManagementAddDto.java new file mode 100644 index 0000000..79c719d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCreditManagementAddDto.java @@ -0,0 +1,32 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * 淇$敤绠$悊濂栬ˉ瀵硅薄 bms_credit_management + * + * @author farben + * @date 2023-09-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsCreditManagementAddDto extends BmsEnterpriseBasicInfoAddDto implements Serializable { + private static final long serialVersionUID = 1L; + + /** 椤圭洰鏂规锛堝寘鎷」鐩熀鏈儏鍐典粙缁嶃侀」鐩姇璧勬儏鍐典互鍙婂疄鏂借繘灞曘侀」鐩洰鏍囧強鍙栧緱鐨勪富瑕佹垚鏁堬級 */ + @Excel(name = "椤圭洰鏂规") + private String projectPlan; + + /** 璧勯噾浣跨敤璇存槑锛堥」鐩湭瀹屾垚鐨勯渶鎻愪緵锛屽唴瀹逛富瑕佸寘鎷」鐩鍒掓姇璧勯锛屾姇璧勬槑缁嗭紝鐩墠宸插畬鎴愭姇璧勬儏鍐靛拰鍚庣画鎶曞叆璁″垝绛夛級 */ + @Excel(name = "璧勯噾浣跨敤璇存槑") + private String usesFunds; + + /** 椤圭洰涓撻」瀹¤鎶ュ憡锛堥」鐩凡瀹屾垚鐨勯渶鎻愪緵锛 */ + @Excel(name = "椤圭洰涓撻」瀹¤鎶ュ憡") + private String auditReport; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCreditManagementUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCreditManagementUpdateDto.java new file mode 100644 index 0000000..4d59d1d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCreditManagementUpdateDto.java @@ -0,0 +1,32 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.declaration.entity.BmsCreditManagement; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 淇$敤绠$悊濂栬ˉ瀵硅薄 bms_credit_management + * + * @author farben + * @date 2023-09-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsCreditManagementUpdateDto extends BmsCreditManagement { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "璁板綍id") + private Long declarationRecordsId; + + @Excel(name = "椤圭洰鍚嶇О") + private String projectName; + + @ApiModelProperty(value = "椤圭洰id") + private Long projectId; + + @ApiModelProperty(value = "瀹℃壒鐘舵:0=鑽夌ǹ,1=鍒濆涓,2=澶嶅涓,3=涓撳璇勫涓,4=甯傜骇璇勫畾涓,5=璇勫畾閫氳繃,6=涓撳璇勫-鎷掔粷,7=澶嶅-鎷掔粷,8=鍒濆-鎷掔粷,9=璇勫畾椹冲洖") + private Long status; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsDeclarationRecordsAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsDeclarationRecordsAddDto.java new file mode 100644 index 0000000..257204b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsDeclarationRecordsAddDto.java @@ -0,0 +1,60 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 鍦ㄧ嚎鐢虫姤璁板綍瀵硅薄 bms_declaration_records + * + * @author farben + * @date 2023-08-28 + */ +@Data +public class BmsDeclarationRecordsAddDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** 椤圭洰鍚嶇О */ + @ApiModelProperty(value = "椤圭洰鍚嶇О") + @Excel(name = "椤圭洰鍚嶇О") + private String projectName; + + @ApiModelProperty(value = "椤圭洰Id") + private Long projectId; + + @ApiModelProperty(value = "鎻愪氦浜嬮」") + private Long matter; + + /** 浼佷笟id */ + @ApiModelProperty(value = "浼佷笟id") + private Long enterpriseId; + + /** 骞翠唤 */ + @ApiModelProperty(value = "骞翠唤") + @Excel(name = "骞翠唤") + private String year; + + /** 妯℃澘id */ + @ApiModelProperty(value = "妯℃澘id") + private Long templateId; + + /** 鐢虫姤妯$増绫诲瀷 */ + @ApiModelProperty(value = "鐢虫姤妯$増绫诲瀷") + private Long declarationTemplateType; + + /** 璇︽儏id锛氬搴旇鎯卛d */ + @ApiModelProperty(value = "璇︽儏id锛氬搴旇鎯卛d") + private Long detailId; + + @ApiModelProperty(value = "娣诲姞鐨勫瓧娈") + private List fieldList; + + @ApiModelProperty(value = "涓婁紶鐨勬枃浠") + private List fileList; + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsDeclarationRecordsDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsDeclarationRecordsDto.java new file mode 100644 index 0000000..b72616f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsDeclarationRecordsDto.java @@ -0,0 +1,49 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +/** + *

+ * 鍦ㄧ嚎鐢虫姤鍒楄〃VO + *

+ * + * @className: BmsDeclarationRecordsDto + * @author: emiya.xie + * @create: 2023-08-28 17:54 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsDeclarationRecordsDto extends BmsDeclarationRecords { + + @ApiModelProperty(value = "鐢虫姤鍗曚綅") + @Excel(name = "鐢虫姤鍗曚綅") + private String enterpriseName; + + /** 绾у埆 0:鏈骇,1:鐪佺骇 */ + @ApiModelProperty(value = "绾у埆 0:鏈骇,1:鐪佺骇") + @Excel(name = "绾у埆", readConverterExp = "0=鏈骇,1=鐪佺骇") + private Long level; + + /** 鐢虫姤绫诲瀷 0:/, 1:璇曠偣鍖哄煙,2:榫欏ご鍨,3:鍒涙柊鍨 */ + @ApiModelProperty(value = "鐢虫姤绫诲瀷 0:/, 1:璇曠偣鍖哄煙,2:榫欏ご鍨,3:鍒涙柊鍨") + @Excel(name = "鐢虫姤绫诲瀷", readConverterExp = "0=/,1=璇曠偣鍖哄煙,2=榫欏ご鍨,3=鍒涙柊鍨") + private Long type; + + /** 璐d换鍗曚綅 0锛氱粡鍙戝:1锛氳寤哄:2锛氳瀹″眬:3锛氬競鐩戝眬 */ + @ApiModelProperty(value = "璐d换鍗曚綅 0锛氱粡鍙戝:1锛氳寤哄:2锛氳瀹″眬:3锛氬競鐩戝眬") + @Excel(name = "璐d换鍗曚綅", readConverterExp = "0=缁忓彂濮,1=瑙勫缓濮,2=琛屽灞,3=甯傜洃灞") + private Long responsibilityUnit; + + @ApiModelProperty(value = "妯℃澘鍚嶇О") + private String templateName; + + @ApiModelProperty(value = "瀹℃壒鐘舵") + @Excel(name = "瀹℃壒鐘舵",readConverterExp = "0=鑽夌ǹ,1=鍒濆涓,2=澶嶅涓,3=涓撳璇勫涓,4=甯傜骇璇勫畾涓,5=璇勫畾閫氳繃,6=涓撳璇勫-鎷掔粷,7=澶嶅-鎷掔粷,8=鍒濆-鎷掔粷,9=璇勫畾椹冲洖") + private List statusStr; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsEnterpriseBasicInfoAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsEnterpriseBasicInfoAddDto.java new file mode 100644 index 0000000..d4bed3f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsEnterpriseBasicInfoAddDto.java @@ -0,0 +1,61 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 浼佷笟鍩虹淇℃伅瀵硅薄 bms_enterprise_basic_info + * + * @author farben + * @date 2023-08-25 + */ +@Data +public class BmsEnterpriseBasicInfoAddDto implements Serializable { + + private static final long serialVersionUID = 1L; + + @Excel(name = "浼佷笟缁熶竴淇$敤浠g爜") + @ApiModelProperty(value = "浼佷笟缁熶竴淇$敤浠g爜") + private String creditCode; + + @Excel(name = "浼佷笟鍚嶇О") + @ApiModelProperty(value = "浼佷笟鍚嶇О") + private String enterpriseName; + + @Excel(name = "鑱旂郴浜") + @ApiModelProperty(value = "鑱旂郴浜") + private String contacts; + + @Excel(name = "鑱旂郴浜虹數璇") + @ApiModelProperty(value = "鑱旂郴浜虹數璇") + private String contactsNumber; + + @Excel(name = "浼佷笟鍦板潃") + @ApiModelProperty(value = "浼佷笟鍦板潃") + private String address; + + @ApiModelProperty(value = "鍦ㄧ嚎鐢虫姤妯$増id") + private int templateRecordId; + + @ApiModelProperty(value = "鐢虫姤鏃堕棿") + private Date fillingTime; + + @ApiModelProperty(value = "鐢虫姤妯$増绫诲瀷") + private int declarationTemplateType; + + @ApiModelProperty(value = "椤圭洰鍚嶇О") + private String projectName; + + @ApiModelProperty(value = "椤圭洰id") + private Long projectId; + + @ApiModelProperty(value = "骞翠唤") + private String year; + + @ApiModelProperty(value = "瀹℃壒鐘舵侊細0:鑽夌ǹ锛1:鍒濆涓") + private Integer status; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsFieldInfoAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsFieldInfoAddDto.java new file mode 100644 index 0000000..ba98cc5 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsFieldInfoAddDto.java @@ -0,0 +1,32 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; + +/** + * 妯℃澘瀛楁濉啓璇︽儏瀵硅薄 bms_field_info + * + * @author farben + * @date 2023-09-04 + */ +@Data +public class BmsFieldInfoAddDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** 璇︽儏id */ + @Excel(name = "璇︽儏id") + private Long detailId; + + /** 瀛楁鍚嶇О */ + @Excel(name = "瀛楁鍚嶇О") + private String fieldName; + + /** 瀛楁璇存槑 */ + @Excel(name = "瀛楁璇存槑") + private String fieldResult; + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsFileInfoAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsFileInfoAddDto.java new file mode 100644 index 0000000..a9e4172 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsFileInfoAddDto.java @@ -0,0 +1,35 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; + +/** + * 鏂囦欢瀛樺偍璇存槑璇︽儏瀵硅薄 bms_file_info + * + * @author farben + * @date 2023-09-04 + */ +@Data +public class BmsFileInfoAddDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** 璇︽儏id */ + @Excel(name = "璇︽儏id") + private Long detailId; + + /** 鏂囦欢鍚嶇О */ + @Excel(name = "鏂囦欢鍚嶇О") + private String fileName; + + /** 鏂囦欢璇存槑 */ + @Excel(name = "鏂囦欢璇存槑") + private String fileDescription; + + /** 鏂囦欢鍦板潃 */ + @Excel(name = "鏂囦欢鍦板潃") + private String fileUrl; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsFundingDetailAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsFundingDetailAddDto.java new file mode 100644 index 0000000..7df075f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsFundingDetailAddDto.java @@ -0,0 +1,45 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; + +/** + * 璧勯噾淇℃伅璇︽儏瀵硅薄 bms_funding_detail + * + * @author farben + * @date 2023-09-04 + */ +@Data +public class BmsFundingDetailAddDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** 妯℃澘绫诲瀷锛1锛氶」鐩惤鎴峰琛ワ紝2锛氬仛澶у仛寮哄琛 */ + @Excel(name = "妯℃澘绫诲瀷锛1锛氶」鐩惤鎴峰琛ワ紝2锛氬仛澶у仛寮哄琛") + private Integer type; + + /** 瀵瑰簲妯℃澘id */ + @Excel(name = "瀵瑰簲妯℃澘id") + private Long templateRecordId; + + /** 璇︽儏id */ + @Excel(name = "璇︽儏id") + private Long detailId; + + private String vModel; + + /** 骞翠唤 */ + @Excel(name = "骞翠唤") + private String year; + + /** 璇存槑 */ + @Excel(name = "璇存槑") + private String illustrate; + + /** 閲戦 */ + @Excel(name = "閲戦") + private Long amount; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsFundingDetailUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsFundingDetailUpdateDto.java new file mode 100644 index 0000000..7f599fe --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsFundingDetailUpdateDto.java @@ -0,0 +1,47 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 璧勯噾淇℃伅璇︽儏瀵硅薄 bms_funding_detail + * + * @author farben + * @date 2023-09-04 + */ +@Data +public class BmsFundingDetailUpdateDto implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "璧勯噾淇℃伅璇︽儏id") + private Long id; + + /** 妯℃澘绫诲瀷锛1锛氶」鐩惤鎴峰琛ワ紝2锛氬仛澶у仛寮哄琛 */ + @Excel(name = "妯℃澘绫诲瀷锛1锛氶」鐩惤鎴峰琛ワ紝2锛氬仛澶у仛寮哄琛") + private Integer type; + + /** 瀵瑰簲妯℃澘id */ + @Excel(name = "瀵瑰簲妯℃澘id") + private Long templateId; + + /** 璇︽儏id */ + @Excel(name = "璇︽儏id") + private Long detailId; + + /** 骞翠唤 */ + @Excel(name = "骞翠唤") + private String year; + + /** 璇存槑 */ + @Excel(name = "璇存槑") + private String illustrate; + + /** 閲戦 */ + @Excel(name = "閲戦") + private Long amount; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIndustrialInternetAwardAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIndustrialInternetAwardAddDto.java new file mode 100644 index 0000000..e90d644 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIndustrialInternetAwardAddDto.java @@ -0,0 +1,30 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * 5G+宸ヤ笟浜掕仈缃戝琛ュ璞 bms_industrial_internet_award + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsIndustrialInternetAwardAddDto extends BmsEnterpriseBasicInfoAddDto implements Serializable { + private static final long serialVersionUID = 1L; + + + /** 鑽h獕鍚嶇О */ + @Excel(name = "鑽h獕鍚嶇О") + private String honoraryName; + + /** 璇佹槑鏉愭枡 */ + @Excel(name = "璇佹槑鏉愭枡") + private String material; + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIndustrialInternetAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIndustrialInternetAwardUpdateDto.java new file mode 100644 index 0000000..2064a9b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIndustrialInternetAwardUpdateDto.java @@ -0,0 +1,33 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.declaration.entity.BmsIndustrialInternetAward; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 5G+宸ヤ笟浜掕仈缃戝琛ュ璞 bms_industrial_internet_award + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsIndustrialInternetAwardUpdateDto extends BmsIndustrialInternetAward { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "璁板綍id") + private Long declarationRecordsId; + + @Excel(name = "椤圭洰鍚嶇О") + private String projectName; + + @ApiModelProperty(value = "椤圭洰id") + private Long projectId; + + @ApiModelProperty(value = "瀹℃壒鐘舵:0=鑽夌ǹ,1=鍒濆涓,2=澶嶅涓,3=涓撳璇勫涓,4=甯傜骇璇勫畾涓,5=璇勫畾閫氳繃,6=涓撳璇勫-鎷掔粷,7=澶嶅-鎷掔粷,8=鍒濆-鎷掔粷,9=璇勫畾椹冲洖") + private Long status; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIntegrationIndustriesAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIntegrationIndustriesAddDto.java new file mode 100644 index 0000000..de726dc --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIntegrationIndustriesAddDto.java @@ -0,0 +1,60 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * 涓や笟铻嶅悎濂栬ˉ瀵硅薄 bms_integration_industries + * + * @author farben + * @date 2023-09-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsIntegrationIndustriesAddDto extends BmsEnterpriseBasicInfoAddDto implements Serializable { + + private static final long serialVersionUID = 1L; + + @Excel(name = "鐢虫姤绫诲瀷",readConverterExp = "1=涓や笟铻嶅悎绀鸿寖浼佷笟,2=鍒堕犱笟浼佷笟璁剧珛璐㈠姟鐙珛鏍哥畻鐨勫埗閫犳湇鍔′笟鑱岃兘閮ㄩ棬,3=鍒堕犱笟浼佷笟鍓ョ鏈嶅姟涓氬姟鎴愮珛鐙珛鐨勬硶浜") + private Integer declarationType; + + /** 璇佹槑鏉愭枡 */ + @Excel(name = "璇佹槑鏉愭枡") + private String evidence; + + /** 钀ヤ笟鎵х収 */ + @Excel(name = "钀ヤ笟鎵х収") + private String businessLicense; + + /** 瀹岀◣璇佹槑 */ + @Excel(name = "瀹岀◣璇佹槑") + private String taxPaymentCertificate; + + /** 瀹¤鎶ュ憡 */ + @Excel(name = "瀹¤鎶ュ憡") + private String auditReport; + + /** 鑲℃潈鏋舵瀯鍥 */ + @Excel(name = "鑲℃潈鏋舵瀯鍥") + private String equityStructureChart; + + /** 椤圭洰鐢虫姤鎶ュ憡锛堝惈浼佷笟鍩烘湰鎯呭喌鍜岄」鐩熀鏈儏鍐碉級 */ + @Excel(name = "椤圭洰鐢虫姤鎶ュ憡") + private String declarationReport; + + /** 鐙珛鏍哥畻鐩稿叧璇佹槑 */ + @Excel(name = "鐙珛鏍哥畻鐩稿叧璇佹槑") + private String independentAccounting; + + /** 楠岃祫鎶ュ憡 */ + @Excel(name = "楠岃祫鎶ュ憡") + private String capitalVerificationReport; + + /** 璇佹槑鏉愭枡 */ + @Excel(name = "璇佹槑鏉愭枡") + private String otherEvidence; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIntegrationIndustriesUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIntegrationIndustriesUpdateDto.java new file mode 100644 index 0000000..53b2724 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIntegrationIndustriesUpdateDto.java @@ -0,0 +1,32 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.jjh.declaration.entity.BmsIntegrationIndustries; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 涓や笟铻嶅悎濂栬ˉ瀵硅薄 bms_integration_industries + * + * @author farben + * @date 2023-09-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsIntegrationIndustriesUpdateDto extends BmsIntegrationIndustries { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "璁板綍id") + private Long declarationRecordsId; + + @ApiModelProperty(value = "椤圭洰鍚嶇О") + private String projectName; + + @ApiModelProperty(value = "椤圭洰id") + private Long projectId; + + @ApiModelProperty(value = "瀹℃壒鐘舵:0=鑽夌ǹ,1=鍒濆涓,2=澶嶅涓,3=涓撳璇勫涓,4=甯傜骇璇勫畾涓,5=璇勫畾閫氳繃,6=涓撳璇勫-鎷掔粷,7=澶嶅-鎷掔粷,8=鍒濆-鎷掔粷,9=璇勫畾椹冲洖") + private Long status; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsLogisticsDevelopmentAwardAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsLogisticsDevelopmentAwardAddDto.java new file mode 100644 index 0000000..762e219 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsLogisticsDevelopmentAwardAddDto.java @@ -0,0 +1,37 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * 鐗╂祦鍙戝睍濂栬ˉ瀵硅薄 bms_logistics_development_award + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsLogisticsDevelopmentAwardAddDto extends BmsEnterpriseBasicInfoAddDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** 鑽h獕璇佹槑鏂囦欢 */ + @Excel(name = "鑽h獕璇佹槑鏂囦欢") + private String honorCertificate; + + /** 骞冲彴鍚嶇О */ + @Excel(name = "骞冲彴鍚嶇О") + private String platformName; + + /** 浼佷笟鎶曡祫椤圭洰澶囨閫氱煡涔︽垨鏍稿噯鎵瑰鏂囦欢 */ + @Excel(name = "浼佷笟鎶曡祫椤圭洰澶囨閫氱煡涔︽垨鏍稿噯鎵瑰鏂囦欢") + private String filingNotice; + + /** 浼氳甯堜簨鍔℃墍鍑哄叿鐨勪紒涓氳储鍔℃姤琛ㄥ璁℃姤鍛 */ + @Excel(name = "浼氳甯堜簨鍔℃墍鍑哄叿鐨勪紒涓氳储鍔℃姤琛ㄥ璁℃姤鍛") + private String auditReport; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsLogisticsDevelopmentAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsLogisticsDevelopmentAwardUpdateDto.java new file mode 100644 index 0000000..6c169d8 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsLogisticsDevelopmentAwardUpdateDto.java @@ -0,0 +1,31 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.jjh.declaration.entity.BmsLogisticsDevelopmentAward; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 鐗╂祦鍙戝睍濂栬ˉ瀵硅薄 bms_logistics_development_award + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsLogisticsDevelopmentAwardUpdateDto extends BmsLogisticsDevelopmentAward { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "璁板綍id") + private Long declarationRecordsId; + + @ApiModelProperty(value = "椤圭洰鍚嶇О") + private String projectName; + + @ApiModelProperty(value = "椤圭洰id") + private Long projectId; + + @ApiModelProperty(value = "瀹℃壒鐘舵:0=鑽夌ǹ,1=鍒濆涓,2=澶嶅涓,3=涓撳璇勫涓,4=甯傜骇璇勫畾涓,5=璇勫畾閫氳繃,6=涓撳璇勫-鎷掔粷,7=澶嶅-鎷掔粷,8=鍒濆-鎷掔粷,9=璇勫畾椹冲洖") + private Long status; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsManufacturingServicesAwardAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsManufacturingServicesAwardAddDto.java new file mode 100644 index 0000000..0ac496c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsManufacturingServicesAwardAddDto.java @@ -0,0 +1,38 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ瀵硅薄 bms_manufacturing_services_award + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsManufacturingServicesAwardAddDto extends BmsEnterpriseBasicInfoAddDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** 浼佷笟鎶曡祫椤圭洰澶囨閫氱煡涔︽垨鏍稿噯鎵瑰鏂囦欢 */ + @Excel(name = "浼佷笟鎶曡祫椤圭洰澶囨閫氱煡涔︽垨鏍稿噯鎵瑰鏂囦欢") + private String filingNotice; + + /** 璐疆璁惧鍙戠エ娓呭崟鍙婂彂绁ㄦ壂鎻忎欢 */ + @Excel(name = "璐疆璁惧鍙戠エ娓呭崟鍙婂彂绁ㄦ壂鎻忎欢") + private String invoice; + + /** 浼氳甯堜簨鍔℃墍鍑哄叿鐨勪紒涓氱敵鎶ラ」鐩喘缃澶囨儏鍐电殑涓撻」瀹¤鎶ュ憡 */ + @Excel(name = "浼氳甯堜簨鍔℃墍鍑哄叿鐨勪紒涓氱敵鎶ラ」鐩喘缃澶囨儏鍐电殑涓撻」瀹¤鎶ュ憡") + private String auditReport; + + /** 浼氳甯堜簨鍔℃墍鍑哄叿鐨勪紒涓氳储鍔℃姤琛ㄥ璁℃姤鍛 */ + @Excel(name = "浼氳甯堜簨鍔℃墍鍑哄叿鐨勪紒涓氳储鍔℃姤琛ㄥ璁℃姤鍛") + private String financialStatements; + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsManufacturingServicesAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsManufacturingServicesAwardUpdateDto.java new file mode 100644 index 0000000..7c1c469 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsManufacturingServicesAwardUpdateDto.java @@ -0,0 +1,31 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.declaration.entity.BmsManufacturingServicesAward; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ瀵硅薄 bms_manufacturing_services_award + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsManufacturingServicesAwardUpdateDto extends BmsManufacturingServicesAward { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "璁板綍id") + private Long declarationRecordsId; + + @Excel(name = "椤圭洰鍚嶇О") + private String projectName; + + @ApiModelProperty(value = "椤圭洰id") + private Long projectId; + + @ApiModelProperty(value = "瀹℃壒鐘舵:0=鑽夌ǹ,1=鍒濆涓,2=澶嶅涓,3=涓撳璇勫涓,4=甯傜骇璇勫畾涓,5=璇勫畾閫氳繃,6=涓撳璇勫-鎷掔粷,7=澶嶅-鎷掔粷,8=鍒濆-鎷掔粷,9=璇勫畾椹冲洖") + private Long status; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsMunicipalBureauReviewQueryDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsMunicipalBureauReviewQueryDto.java new file mode 100644 index 0000000..693176a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsMunicipalBureauReviewQueryDto.java @@ -0,0 +1,50 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 甯傚眬璇勫 鏌ヨ + *

+ * + * @className: BmsDeclarationRecordsQueryVo + * @author: emiya.xie + * @create: 2023-08-28 17:54 + */ +@Data +public class BmsMunicipalBureauReviewQueryDto implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + @Excel(name="瀵瑰簲id") + private Long id; + + @ApiModelProperty(value = "缁熶竴淇$敤浠g爜") + @Excel(name = "缁熶竴淇$敤浠g爜") + private String creditCode; + + @ApiModelProperty(value = "浼佷笟鍚嶇О") + @Excel(name = "浼佷笟鍚嶇О") + private String enterpriseName; + + @ApiModelProperty(value = "鐢虫姤绫诲瀷") + @Excel(name = "鐢虫姤绫诲瀷") + private String projectName; + + @ApiModelProperty(value = "骞翠唤") + @Excel(name = "骞翠唤") + private String year; + + @ApiModelProperty(value = "甯傜骇璇勫畾缁撴灉锛0锛氶氳繃锛1锛氫笉閫氳繃") + private Integer result; + + @ApiModelProperty(value = "甯傜骇璇勫畾缁撴灉鎰忚") + private String opinion; + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsPlatformConstructionAwardAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsPlatformConstructionAwardAddDto.java new file mode 100644 index 0000000..ce4b7b9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsPlatformConstructionAwardAddDto.java @@ -0,0 +1,29 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * 骞冲彴寤鸿濂栬ˉ瀵硅薄 bms_platform_construction_award + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsPlatformConstructionAwardAddDto extends BmsEnterpriseBasicInfoAddDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** 骞冲彴锛堥」鐩級鍚嶇О */ + @Excel(name = "骞冲彴锛堥」鐩級鍚嶇О") + private String platformName; + + /** 鍚堜綔鍗忚 */ + @Excel(name = "鍚堜綔鍗忚") + private String agreement; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsPlatformConstructionAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsPlatformConstructionAwardUpdateDto.java new file mode 100644 index 0000000..af8bab1 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsPlatformConstructionAwardUpdateDto.java @@ -0,0 +1,31 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.jjh.declaration.entity.BmsPlatformConstructionAward; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 骞冲彴寤鸿濂栬ˉ瀵硅薄 bms_platform_construction_award + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsPlatformConstructionAwardUpdateDto extends BmsPlatformConstructionAward { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "璁板綍id") + private Long declarationRecordsId; + + @ApiModelProperty(value = "椤圭洰鍚嶇О") + private String projectName; + + @ApiModelProperty(value = "椤圭洰id") + private Long projectId; + + @ApiModelProperty(value = "瀹℃壒鐘舵:0=鑽夌ǹ,1=鍒濆涓,2=澶嶅涓,3=涓撳璇勫涓,4=甯傜骇璇勫畾涓,5=璇勫畾閫氳繃,6=涓撳璇勫-鎷掔粷,7=澶嶅-鎷掔粷,8=鍒濆-鎷掔粷,9=璇勫畾椹冲洖") + private Long status; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsProjectSettlementAwardAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsProjectSettlementAwardAddDto.java new file mode 100644 index 0000000..99d3b4d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsProjectSettlementAwardAddDto.java @@ -0,0 +1,53 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 椤圭洰钀芥埛濂栬ˉ瀵硅薄 bms_project_settlement_award + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsProjectSettlementAwardAddDto extends BmsEnterpriseBasicInfoAddDto implements Serializable { + + private static final long serialVersionUID = 1L; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "鐢虫姤鍗曚綅鎴愮珛鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty(value = "鐢虫姤鍗曚綅鎴愮珛鏃堕棿") + private Date establishTime; + + @Excel(name = "鎴嚦鐩墠鍛樺伐浜烘暟") + @ApiModelProperty(value = "鎴嚦鐩墠鍛樺伐浜烘暟") + private Long employeeNum; + + @ApiModelProperty(value = "搴旀敹鍒楄〃") + private List fundingDetailList; + + @Excel(name = "鎷涘晢鍗忚") + @ApiModelProperty(value = "鎷涘晢鍗忚") + private String agreement; + + @Excel(name = "楠岃祫鎶ュ憡") + @ApiModelProperty(value = "楠岃祫鎶ュ憡") + private String report; + + @Excel(name = "鍏朵粬鏉愭枡") + @ApiModelProperty(value = "鍏朵粬鏉愭枡") + private String otherMaterials; + + @Excel(name = "钀ヤ笟鎵х収") + @ApiModelProperty(value = "钀ヤ笟鎵х収") + private String businessLicense; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsProjectSettlementAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsProjectSettlementAwardUpdateDto.java new file mode 100644 index 0000000..add5903 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsProjectSettlementAwardUpdateDto.java @@ -0,0 +1,39 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.jjh.declaration.entity.BmsFundingDetail; +import com.ruoyi.jjh.declaration.entity.BmsProjectSettlementAward; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.List; + +/** + * 椤圭洰钀芥埛濂栬ˉ瀵硅薄 bms_project_settlement_award + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsProjectSettlementAwardUpdateDto extends BmsProjectSettlementAward implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "璁板綍id") + private Long declarationRecordsId; + + @ApiModelProperty(value = "搴旀敹鍒楄〃") + private List fundingDetailList; + + @ApiModelProperty(value = "椤圭洰鍚嶇О") + private String projectName; + + @ApiModelProperty(value = "椤圭洰id") + private Long projectId; + + @ApiModelProperty(value = "瀹℃壒鐘舵:0=鑽夌ǹ,1=鍒濆涓,2=澶嶅涓,3=涓撳璇勫涓,4=甯傜骇璇勫畾涓,5=璇勫畾閫氳繃,6=涓撳璇勫-鎷掔粷,7=澶嶅-鎷掔粷,8=鍒濆-鎷掔粷,9=璇勫畾椹冲洖") + private Long status; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsSceneOpeningAwardAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsSceneOpeningAwardAddDto.java new file mode 100644 index 0000000..aefe2fa --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsSceneOpeningAwardAddDto.java @@ -0,0 +1,33 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * 鍦烘櫙寮鏀惧琛ュ璞 bms_scene_opening_award + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsSceneOpeningAwardAddDto extends BmsEnterpriseBasicInfoAddDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** 椤圭洰鍚嶇О */ + @Excel(name = "椤圭洰鍚嶇О") + private String projectName; + + /** 鎵灞炵被鍨 */ + @Excel(name = "鎵灞炵被鍨") + private Long type; + + /** 鍏ず銆佸彂鏂囪瘉鏄庛佷笓瀹惰瘎鍒嗚〃 */ + @Excel(name = "鍏ず銆佸彂鏂囪瘉鏄庛佷笓瀹惰瘎鍒嗚〃") + private String material; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsSceneOpeningAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsSceneOpeningAwardUpdateDto.java new file mode 100644 index 0000000..0f5d23b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsSceneOpeningAwardUpdateDto.java @@ -0,0 +1,28 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.jjh.declaration.entity.BmsSceneOpeningAward; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 鍦烘櫙寮鏀惧琛ュ璞 bms_scene_opening_award + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsSceneOpeningAwardUpdateDto extends BmsSceneOpeningAward { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "璁板綍id") + private Long declarationRecordsId; + + @ApiModelProperty(value = "瀹℃壒鐘舵:0=鑽夌ǹ,1=鍒濆涓,2=澶嶅涓,3=涓撳璇勫涓,4=甯傜骇璇勫畾涓,5=璇勫畾閫氳繃,6=涓撳璇勫-鎷掔粷,7=澶嶅-鎷掔粷,8=鍒濆-鎷掔粷,9=璇勫畾椹冲洖") + private Long status; + + @ApiModelProperty(value = "椤圭洰id") + private Long projectId; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsTemplateInfoAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsTemplateInfoAddDto.java new file mode 100644 index 0000000..1a8adf9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsTemplateInfoAddDto.java @@ -0,0 +1,27 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory; +import com.ruoyi.jjh.declaration.entity.BmsTemplateInfo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +/** + * 鐢虫姤妯℃澘淇℃伅瀵硅薄 bms_template_info + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsTemplateInfoAddDto extends BmsTemplateInfo { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "浼佷笟鍚嶅綍") + private List enterpriseDirectoryList; + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsTemplateQueryDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsTemplateQueryDto.java new file mode 100644 index 0000000..e94af88 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsTemplateQueryDto.java @@ -0,0 +1,31 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 鐢虫姤妯℃澘淇℃伅瀵硅薄 bms_template_info + * + * @author farben + * @date 2023-08-25 + */ +@Data +public class BmsTemplateQueryDto implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "浼佷笟id") + private Long enterpriseId; + + @ApiModelProperty(value = "浼佷笟淇$敤缁熶竴淇$敤浠g爜") + private String creditCode; + + @ApiModelProperty(value = "璐d换鍗曚綅 0锛氱粡鍙戝:1锛氳寤哄:2锛氳瀹″眬:3锛氬競鐩戝眬") + @Excel(name = "璐d换鍗曚綅",readConverterExp = "0=缁忓彂濮,1=瑙勫缓濮,2=琛屽灞,3=甯傜洃灞") + private Long responsibilityUnit; + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsTemplateRecordAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsTemplateRecordAddDto.java new file mode 100644 index 0000000..cbed95a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsTemplateRecordAddDto.java @@ -0,0 +1,25 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory; +import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +/** + * 鍦ㄧ嚎妯℃澘瀵硅薄 bms_template_record + * + * @author farben + * @date 2023-09-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsTemplateRecordAddDto extends BmsTemplateRecord { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "浼佷笟鍚嶅綍") + private List enterpriseDirectoryList; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsTemplateRecordQueryDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsTemplateRecordQueryDto.java new file mode 100644 index 0000000..e59429b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsTemplateRecordQueryDto.java @@ -0,0 +1,52 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 鐢虫姤妯℃澘淇℃伅瀵硅薄 bms_template_info + * + * @author farben + * @date 2023-08-25 + */ +@Data +public class BmsTemplateRecordQueryDto implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "浼佷笟鍚嶅綍") + private String enterpriseDirectory; + + @ApiModelProperty(value = "妯℃澘id") + private Long templateId; + + @ApiModelProperty(value = "绾у埆 0:鏈骇,1:鐪佺骇") + @Excel(name = "绾у埆 ",readConverterExp = "0=鏈骇,1=鐪佺骇") + private Integer level; + + @ApiModelProperty(value = "鐢虫姤閫斿緞,0:绯荤粺鐢虫姤,1:琛ュ綍") + @Excel(name = "鐢虫姤閫斿緞",readConverterExp = "0=绯荤粺鐢虫姤,1=琛ュ綍") + private Long road; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "寮鏀惧紑濮嬫椂闂", width = 30, dateFormat = "yyyy-MM-dd") + private Date startTime; + + /** 寮鏀剧粨鏉熸椂闂 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "寮鏀剧粨鏉熸椂闂", width = 30, dateFormat = "yyyy-MM-dd") + private Date endTime; + + @ApiModelProperty(value = "璐d换鍗曚綅 0锛氱粡鍙戝:1锛氳寤哄:2锛氳瀹″眬:3锛氬競鐩戝眬") + @Excel(name = "璐d换鍗曚綅",readConverterExp = "0=缁忓彂濮,1=瑙勫缓濮,2=琛屽灞,3=甯傜洃灞") + private Long responsibilityUnit; + + @ApiModelProperty(value = "妯℃澘鍚嶇О") + private String templateName; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsTemplateRecordUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsTemplateRecordUpdateDto.java new file mode 100644 index 0000000..45b4cb1 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsTemplateRecordUpdateDto.java @@ -0,0 +1,27 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory; +import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + + +/** + * 鍦ㄧ嚎妯℃澘瀵硅薄 bms_template_record + * + * @author farben + * @date 2023-09-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsTemplateRecordUpdateDto extends BmsTemplateRecord { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "浼佷笟鍚嶅綍") + private List enterpriseDirectoryList; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BsmFundingInfoAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BsmFundingInfoAddDto.java new file mode 100644 index 0000000..f84afae --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BsmFundingInfoAddDto.java @@ -0,0 +1,69 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import com.ruoyi.common.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 璧勯噾淇℃伅瀵硅薄 bsm_funding_info + * + * @author farben + * @date 2023-08-25 + */ +@Data +public class BsmFundingInfoAddDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** 妯℃澘绫诲瀷锛0锛氶」鐩惤鎴峰琛ワ紝1锛氬仛澶у仛寮哄琛 */ + @Excel(name = "妯℃澘绫诲瀷锛1锛氶」鐩惤鎴峰琛ワ紝2锛氬仛澶у仛寮哄琛") + private Long type; + + /** 瀵瑰簲妯℃澘id */ + @Excel(name = "瀵瑰簲妯℃澘id") + private Long templateId; + + @ApiModelProperty(value = "璇︽儏id") + private Long detailId; + + /** 钀ユ敹骞翠唤 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "钀ユ敹骞翠唤", width = 30, dateFormat = "yyyy-MM-dd") + private Date revenueYear; + + /** 钀ユ敹 */ + @Excel(name = "钀ユ敹") + private Long revenue; + + /** 绋庢敹骞翠唤 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "绋庢敹骞翠唤", width = 30, dateFormat = "yyyy-MM-dd") + private Date taxationYear; + + /** 绋庢敹 */ + @Excel(name = "绋庢敹") + private Long taxation; + + /** 棰勮钀ユ敹骞翠唤 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "棰勮钀ユ敹骞翠唤", width = 30, dateFormat = "yyyy-MM-dd") + private Date expectedRevenueYear; + + /** 棰勮钀ユ敹 */ + @Excel(name = "棰勮钀ユ敹") + private Long expectedRevenue; + + /** 棰勮绋庢敹骞翠唤 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "棰勮绋庢敹骞翠唤", width = 30, dateFormat = "yyyy-MM-dd") + private Date expectedTaxationYear; + + /** 棰勮绋庢敹 */ + @Excel(name = "棰勮绋庢敹") + private Long expectedTaxation; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/MunicipalReviewDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/MunicipalReviewDto.java new file mode 100644 index 0000000..22a0167 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/MunicipalReviewDto.java @@ -0,0 +1,29 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 甯傜骇璇勫畾Dto + *

+ * + * @className: MunicipalReviewInfoDto + * @author: emiya.xie + * @create: 2023-09-13 16:30 + */ +@Data +public class MunicipalReviewDto implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "甯傜骇璇勫畾淇℃伅-old") + private List list; + + @ApiModelProperty(value = "甯傜骇璇勫畾淇℃伅-new") + private List reviewList; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/MunicipalReviewInfoDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/MunicipalReviewInfoDto.java new file mode 100644 index 0000000..b646787 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/MunicipalReviewInfoDto.java @@ -0,0 +1,46 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 甯傜骇璇勫畾 + *

+ * + * @className: MunicipalReviewInfoDto + * @author: emiya.xie + * @create: 2023-09-13 16:30 + */ +@Data +public class MunicipalReviewInfoDto implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "璁板綍id") + private Long declarationId; + + @ApiModelProperty(value = "浼佷笟id") + private Long enterpriseId; + + @ApiModelProperty(value = "浼佷笟鍚嶇О") + private String enterpriseName; + + @ApiModelProperty(value = "浼佷笟缁熶竴淇$敤浠g爜") + private String creditCode; + + @ApiModelProperty(value = "鐢虫姤绫诲瀷璇存槑") + private String declarationTypeStr; + + @ApiModelProperty(value = "骞翠唤") + private String year; + + @ApiModelProperty(value = "甯傜骇璇勫畾缁撴灉") + private String result; + + @ApiModelProperty(value = "缁撴灉") + private Long status; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/OpenInterfaceApplyAddDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/OpenInterfaceApplyAddDto.java new file mode 100644 index 0000000..1f11cc6 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/OpenInterfaceApplyAddDto.java @@ -0,0 +1,57 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 鐢宠璁板綍淇℃伅鏂板-寮鏀 + *

+ * + * @className: OpenInterfaceApplyAddDto + * @author: emiya.xie + * @create: 2023-09-12 14:42 + */ +@Data +public class OpenInterfaceApplyAddDto implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "鐢虫姤妯$増绫诲瀷") + private Integer declarationTemplateType; + + @ApiModelProperty(value = "椤圭洰钀芥埛濂栬ˉ鏂板Dto") + private BmsProjectSettlementAwardAddDto bmsProjectSettlementAwardAddDto; + + @ApiModelProperty(value = "鍋氬ぇ鍋氬己濂栬ˉ鏂板Dto") + private BmsBigStrongAwardAddDto bmsBigStrongAwardAddDto; + + @ApiModelProperty(value = "杞戒綋寤鸿濂栬ˉ鏂板Dto") + private BmsCarrierConstructionAwardAddDto bmsCarrierConstructionAwardAddDto; + + @ApiModelProperty(value = "鍙板缓璁惧琛ユ柊澧濪to") + private BmsPlatformConstructionAwardAddDto bmsPlatformConstructionAwardAddDto; + + @ApiModelProperty(value = "鍝佺墝鎵撻犲琛ユ柊澧濪to") + private BmsBrandingAwardAddDto bmsBrandingAwardAddDto; + + @ApiModelProperty(value = "鍦烘櫙寮鏀惧琛ユ柊澧濪to") + private BmsSceneOpeningAwardAddDto bmsSceneOpeningAwardAddDto; + + @ApiModelProperty(value = "淇$敤绠$悊濂栬ˉ鏂板Dto") + private BmsCreditManagementAddDto bmsCreditManagementAddDto; + + @ApiModelProperty(value = "5G+宸ヤ笟浜掕仈缃戝琛ユ柊澧濪to") + private BmsIndustrialInternetAwardAddDto bmsIndustrialInternetAwardAddDto; + + @ApiModelProperty(value = "鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ鏂板Dto") + private BmsManufacturingServicesAwardAddDto bmsManufacturingServicesAwardAddDto; + + @ApiModelProperty(value = "鐗╂祦鍙戝睍濂栬ˉ鏂板Dto") + private BmsLogisticsDevelopmentAwardAddDto bmsLogisticsDevelopmentAwardAddDto; + + @ApiModelProperty(value = "涓や笟铻嶅悎濂栬ˉ鏂板Dto") + private BmsIntegrationIndustriesAddDto bmsIntegrationIndustriesAddDto; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/UploadDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/UploadDto.java new file mode 100644 index 0000000..4aaec09 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/UploadDto.java @@ -0,0 +1,20 @@ +package com.ruoyi.jjh.declaration.entity.dto; + +import lombok.Data; + +/** + *

+ * 涓婁紶鍐呭 + *

+ * + * @className: UploadDto + * @author: emiya.xie + * @create: 2023-03-01 09:53 + */ +@Data +public class UploadDto { + + private String name; + + private String url; +} \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/ApprovalDeclarationRecordsQueryVo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/ApprovalDeclarationRecordsQueryVo.java new file mode 100644 index 0000000..27d938c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/ApprovalDeclarationRecordsQueryVo.java @@ -0,0 +1,69 @@ +package com.ruoyi.jjh.declaration.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + *

+ * 瀹℃牳鐢虫姤璁板綍鏌ヨ + *

+ * + * @className: ApprovalDeclarationRecordsQueryDto + * @author: emiya.xie + * @create: 2023-09-09 15:07 + */ +@Data +public class ApprovalDeclarationRecordsQueryVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "瀹℃壒鐘舵(0=寰呭鏍.1=瀹℃壒閫氳繃,2=瀹℃壒椹冲洖)") + private Integer approvalStatus; + + @ApiModelProperty(value = "浜嬮」") + private String matter; + + @ApiModelProperty(value = "椤圭洰鍚嶇О") + private String projectName; + + @ApiModelProperty(value = "椤圭洰绫诲瀷锛氫篃灏辨槸浜у搧棰嗗煙") + private Integer productArea; + + @ApiModelProperty(value = "鐢虫姤鍗曚綅") + private String enterpriseName; + + @ApiModelProperty(value = "鎵舵寔鏂瑰紡") + private Integer supportMethods; + + @ApiModelProperty(value = "鐢宠鏃堕棿") + private Date createTime; + + @ApiModelProperty(value = "椤圭洰寮濮嬫椂闂") + private Date startTime; + + @ApiModelProperty(value = "椤圭洰缁撴潫鏃堕棿") + private Date endTime; + + @ApiModelProperty(value = "瀹℃牳鐘舵") + private Integer status; + + @ApiModelProperty(value = "鐢虫姤璁板綍妯℃澘id") + private Long templateRecordId; + + @ApiModelProperty(value = "鐢虫姤璁板綍妯℃澘id") + private Long templateId; + + @ApiModelProperty(value = "璁板綍id") + private Long declarationRecordsId; + + @ApiModelProperty(value = "璇︽儏id") + private Long detailId; + + @ApiModelProperty(value = "瀹℃壒鏃堕棿") + private Date approvalTime; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsApprovalInfoQueryVo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsApprovalInfoQueryVo.java new file mode 100644 index 0000000..2c0a0a0 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsApprovalInfoQueryVo.java @@ -0,0 +1,58 @@ +package com.ruoyi.jjh.declaration.entity.vo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; + +/** + * 瀹℃壒璁板綍淇℃伅瀵硅薄 bms_approval_info + * + * @author farben + * @date 2023-09-09 + */ +@Data +public class BmsApprovalInfoQueryVo implements Serializable { + private static final long serialVersionUID = 1L; + + /** 涓婚敭id */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @Excel(name = "榛樿瀹℃壒浜篿d") + private Long approvalById; + + @Excel(name = "榛樿瀹℃壒浜") + private String approvalByName; + + /** 瀹℃壒鐘舵(0=寰呭鏍.1=瀹℃壒閫氳繃,2=瀹℃壒椹冲洖) */ + @Excel(name = "瀹℃壒鐘舵(0=寰呭鏍.1=瀹℃壒閫氳繃,2=瀹℃壒椹冲洖)") + private Integer approvalStatus; + + /** 瀹℃壒鎰忚 */ + @Excel(name = "瀹℃壒鎰忚") + private String approvalOpinions; + + /** 瀹℃壒闄勪欢 */ + @Excel(name = "瀹℃壒闄勪欢") + private String approvalAttachment; + + /** 鏄惁鍙鏍(0=鏄,1=鍚,2=缁撴潫) */ + @Excel(name = "鏄惁鍙鏍(0=鏄,1=鍚,2=缁撴潫)") + private Integer isReview; + + @Excel(name = "鏄惁涓烘嫆缁濆墠鏁版嵁锛0锛氬惁锛1锛氭槸") + private Integer isBeforeData; + + /** 鎺掑簭 */ + @Excel(name = "鎺掑簭") + private Integer sort; + + @Excel(name = "瀹℃壒鏃堕棿") + private String approvalTime; + + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsBigStrongAwardQueryVo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsBigStrongAwardQueryVo.java new file mode 100644 index 0000000..8e52ed0 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsBigStrongAwardQueryVo.java @@ -0,0 +1,26 @@ +package com.ruoyi.jjh.declaration.entity.vo; + +import com.ruoyi.jjh.declaration.entity.BmsBigStrongAward; +import com.ruoyi.jjh.declaration.entity.BmsFundingDetail; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + + +/** + * 鍋氬ぇ鍋氬己濂栬鎯呭璞 bms_big_strong_award + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsBigStrongAwardQueryVo extends BmsBigStrongAward { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "搴旀敹鍒楄〃") + private List fundingDetailList; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsDeclarationRecordsQueryVo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsDeclarationRecordsQueryVo.java new file mode 100644 index 0000000..37497bf --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsDeclarationRecordsQueryVo.java @@ -0,0 +1,89 @@ +package com.ruoyi.jjh.declaration.entity.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + *

+ * 鍦ㄧ嚎鐢虫姤鍒楄〃VO + *

+ * + * @className: BmsDeclarationRecordsQueryVo + * @author: emiya.xie + * @create: 2023-08-28 17:54 + */ +@Data +public class BmsDeclarationRecordsQueryVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "椤圭洰鍚嶇О") + @Excel(name = "椤圭洰鍚嶇О") + private String projectName; + + @ApiModelProperty(value = "椤圭洰id") + private Long projectId; + + @ApiModelProperty(value = "鐢虫姤鍗曚綅") + @Excel(name = "鐢虫姤鍗曚綅") + private String enterpriseName; + + @ApiModelProperty(value = "绾у埆 0:鏈骇,1:鐪佺骇") + @Excel(name = "绾у埆", readConverterExp = "0=鏈骇,1=鐪佺骇") + private Long level; + + @ApiModelProperty(value = "骞翠唤") + @Excel(name = "骞翠唤") + private String year; + + @ApiModelProperty(value = "鐢虫姤绫诲瀷 0:/, 1:璇曠偣鍖哄煙,2:榫欏ご鍨,3:鍒涙柊鍨") + @Excel(name = "鐢虫姤绫诲瀷", readConverterExp = "0=/,1=璇曠偣鍖哄煙,2=榫欏ご鍨,3=鍒涙柊鍨") + private Long type; + + @ApiModelProperty(value = "鐢虫姤閫斿緞 0:绯荤粺鐢虫姤锛1:琛ュ綍") + @Excel(name = "鐢虫姤閫斿緞", readConverterExp = "0=绯荤粺鐢虫姤,1=琛ュ綍") + private Integer road; + + @ApiModelProperty(value = "璐d换鍗曚綅 0锛氱粡鍙戝:1锛氳寤哄:2锛氳瀹″眬:3锛氬競鐩戝眬") + @Excel(name = "璐d换鍗曚綅", readConverterExp = "0=缁忓彂濮,1=瑙勫缓濮,2=琛屽灞,3=甯傜洃灞") + private Long responsibilityUnit; + + @ApiModelProperty(value = "鐢虫姤琛ㄥ崟") + @Excel(name = "鐢虫姤琛ㄥ崟", readConverterExp = "1=椤圭洰钀芥埛濂栬ˉ浼佷笟鐢虫姤妯$増,2=鍋氬ぇ鍋氬己濂栬ˉ浼佷笟鐢虫姤妯$増,3=杞戒綋寤鸿濂栬ˉ浼佷笟鐢虫姤妯$増" + + ",4=骞冲彴寤鸿濂栬ˉ浼佷笟鐢虫姤妯$増,5=鍝佺墝鎵撻犲琛ヤ紒涓氱敵鎶ユā鐗,6=鍦烘櫙寮鏀惧琛ヤ紒涓氱敵鎶ユā鐗,7=淇$敤绠$悊濂栬ˉ浼佷笟鐢虫姤妯$増" + + ",8=5G+宸ヤ笟浜掕仈缃戝琛ヤ紒涓氱敵鎶ユā鐗,9=鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ浼佷笟鐢虫姤妯$増,10=鐗╂祦鍙戝睍濂栬ˉ浼佷笟鐢虫姤妯$増") + private Long declarationTemplateType; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "鐢虫姤鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "鏇存柊鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + @ApiModelProperty(value = "浼佷笟id") + private Long enterpriseId; + + @ApiModelProperty(value = "鐢虫姤妯℃澘id") + private Long templateRecordId; + + @ApiModelProperty(value = "鐢虫姤妯℃澘id") + private Long templateId; + + @ApiModelProperty(value = "璇︽儏id锛氬搴旇鎯卛d") + private Long detailId; + + @ApiModelProperty(value = "瀹℃壒鐘舵") + @Excel(name = "瀹℃壒鐘舵", readConverterExp = "0=鑽夌ǹ,1=鍒濆涓,2=澶嶅涓,3=涓撳璇勫涓,4=甯傜骇璇勫畾涓,5=璇勫畾閫氳繃,6=涓撳璇勫-鎷掔粷,7=澶嶅-鎷掔粷,8=鍒濆-鎷掔粷") + private Long status; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsMunicipalBureauReviewQueryVo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsMunicipalBureauReviewQueryVo.java new file mode 100644 index 0000000..81636b8 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsMunicipalBureauReviewQueryVo.java @@ -0,0 +1,51 @@ +package com.ruoyi.jjh.declaration.entity.vo; + +import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 甯傚眬璇勫 鏌ヨ + *

+ * + * @className: BmsDeclarationRecordsQueryVo + * @author: emiya.xie + * @create: 2023-08-28 17:54 + */ +@Data +public class BmsMunicipalBureauReviewQueryVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + @Excel(name = "瀵瑰簲id") + private Long id; + + @ApiModelProperty(value = "缁熶竴淇$敤浠g爜") + @Excel(name = "缁熶竴淇$敤浠g爜") + private String creditCode; + + @ApiModelProperty(value = "浼佷笟鍚嶇О") + @Excel(name = "浼佷笟鍚嶇О") + private String enterpriseName; + + @ApiModelProperty(value = "鐢虫姤绫诲瀷") + @Excel(name = "鐢虫姤绫诲瀷") + private String projectName; + + @ApiModelProperty(value = "骞翠唤") + @Excel(name = "骞翠唤") + private String year; + + @ApiModelProperty(value = "甯傜骇璇勫畾缁撴灉锛0锛氶氳繃锛1锛氫笉閫氳繃") + @Excel(name = "甯傜骇璇勫畾缁撴灉锛0锛氶氳繃锛1锛氫笉閫氳繃") + private Integer result; + + @ApiModelProperty(value = "甯傜骇璇勫畾缁撴灉鎰忚") + @Excel(name = "甯傜骇璇勫畾缁撴灉鎰忚") + private String opinion; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsProjectSettlementAwardQueryVo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsProjectSettlementAwardQueryVo.java new file mode 100644 index 0000000..7c9746c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsProjectSettlementAwardQueryVo.java @@ -0,0 +1,26 @@ +package com.ruoyi.jjh.declaration.entity.vo; + +import com.ruoyi.jjh.declaration.entity.BmsFundingDetail; +import com.ruoyi.jjh.declaration.entity.BmsProjectSettlementAward; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + + +/** + * 椤圭洰钀芥埛濂栬ˉ瀵硅薄 bms_project_settlement_award + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsProjectSettlementAwardQueryVo extends BmsProjectSettlementAward { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "搴旀敹鍒楄〃") + private List fundingDetailList; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsProjectSettlementAwardVo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsProjectSettlementAwardVo.java new file mode 100644 index 0000000..907c9ba --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsProjectSettlementAwardVo.java @@ -0,0 +1,67 @@ +package com.ruoyi.jjh.declaration.entity.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.declaration.entity.dto.BmsEnterpriseBasicInfoAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsFundingDetailAddDto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 椤圭洰钀芥埛濂栬ˉ瀵硅薄 bms_project_settlement_award + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsProjectSettlementAwardVo extends BmsEnterpriseBasicInfoAddDto implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "璁板綍id") + private Long id; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "鐢虫姤鍗曚綅鎴愮珛鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty(value = "鐢虫姤鍗曚綅鎴愮珛鏃堕棿") + private Date establishTime; + + @Excel(name = "鎴嚦鐩墠鍛樺伐浜烘暟") + @ApiModelProperty(value = "鎴嚦鐩墠鍛樺伐浜烘暟") + private Long employeeNum; + + @ApiModelProperty(value = "搴旀敹鍒楄〃") + private List fundingDetailList; + + @Excel(name = "鎷涘晢鍗忚") + @ApiModelProperty(value = "鎷涘晢鍗忚") + private String agreement; + + @Excel(name = "楠岃祫鎶ュ憡") + @ApiModelProperty(value = "楠岃祫鎶ュ憡") + private String report; + + @Excel(name = "鍏朵粬鏉愭枡") + @ApiModelProperty(value = "鍏朵粬鏉愭枡") + private String otherMaterials; + + @Excel(name = "钀ヤ笟鎵х収") + @ApiModelProperty(value = "钀ヤ笟鎵х収") + private String businessLicense; + + @ApiModelProperty(value = "鍒涘缓鑰") + private String createBy; + + @ApiModelProperty(value = "鍒涘缓鏃堕棿") + private Date createTime; + + @ApiModelProperty(value = "澶囨敞") + private String remark; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsTemplateInfoQueryVo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsTemplateInfoQueryVo.java new file mode 100644 index 0000000..c4337cb --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsTemplateInfoQueryVo.java @@ -0,0 +1,23 @@ +package com.ruoyi.jjh.declaration.entity.vo; + +import com.ruoyi.jjh.declaration.entity.BmsTemplateInfo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 鐢虫姤妯℃澘淇℃伅瀵硅薄 bms_template_info + * + * @author farben + * @date 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsTemplateInfoQueryVo extends BmsTemplateInfo { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "鍒涘缓浜") + private String createByName; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsTemplateRecordQueryVo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsTemplateRecordQueryVo.java new file mode 100644 index 0000000..c4fca42 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsTemplateRecordQueryVo.java @@ -0,0 +1,69 @@ +package com.ruoyi.jjh.declaration.entity.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 鐢虫姤妯℃澘淇℃伅瀵硅薄 bms_template_info + * + * @author farben + * @date 2023-08-25 + */ +@Data +public class BmsTemplateRecordQueryVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "浼佷笟椤圭洰鍚嶅綍id") + private Long templateRecordId; + + @ApiModelProperty(value = "浼佷笟鍚嶅綍") + private String enterpriseDirectory; + + @ApiModelProperty(value = "妯℃澘绫诲瀷") + private String templateName; + + @ApiModelProperty(value = "妯℃澘id") + private Long templateId; + + @ApiModelProperty(value = "绾у埆 0:鏈骇,1:鐪佺骇") + @Excel(name = "绾у埆 ", readConverterExp = "0=鏈骇,1=鐪佺骇") + private int level; + + @ApiModelProperty(value = "鐢虫姤閫斿緞,0:绯荤粺鐢虫姤,1:琛ュ綍") + @Excel(name = "鐢虫姤閫斿緞", readConverterExp = "0=绯荤粺鐢虫姤,1=琛ュ綍") + private Long road; + + @ApiModelProperty(value = "涓婁紶鏂囦欢鍚嶇О") + private String fileName; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "寮鏀惧紑濮嬫椂闂", width = 30, dateFormat = "yyyy-MM-dd") + private Date startTime; + + /** + * 寮鏀剧粨鏉熸椂闂 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "寮鏀剧粨鏉熸椂闂", width = 30, dateFormat = "yyyy-MM-dd") + private Date endTime; + + @Excel(name = "璇存槑") + private String notes; + + @ApiModelProperty(value = "璐d换鍗曚綅 0锛氱粡鍙戝:1锛氳寤哄:2锛氳瀹″眬:3锛氬競鐩戝眬") + @Excel(name = "璐d换鍗曚綅", readConverterExp = "0=缁忓彂濮,1=瑙勫缓濮,2=琛屽灞,3=甯傜洃灞") + private Long responsibilityUnit; + + @ApiModelProperty(value = "鍒涘缓鏃堕棿") + private Date createTime; + + @ApiModelProperty(value = "鍒涘缓浜") + private String createByName; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsTemplateRecordVo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsTemplateRecordVo.java new file mode 100644 index 0000000..200f38b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsTemplateRecordVo.java @@ -0,0 +1,31 @@ +package com.ruoyi.jjh.declaration.entity.vo; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory; +import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +/** + * 鍦ㄧ嚎妯℃澘瀵硅薄 bms_template_record + * + * @author farben + * @date 2023-09-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BmsTemplateRecordVo extends BmsTemplateRecord { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "浼佷笟鍚嶅綍鍒楄〃") + private List enterpriseDirectoryList; + + @ApiModelProperty(value = "璐d换鍗曚綅 0锛氱粡鍙戝:1锛氳寤哄:2锛氳瀹″眬:3锛氬競鐩戝眬") + @Excel(name = "璐d换鍗曚綅", readConverterExp = "0=缁忓彂濮,1=瑙勫缓濮,2=琛屽灞,3=甯傜洃灞") + private Long responsibilityUnit; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/DeclarationRecordsVo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/DeclarationRecordsVo.java new file mode 100644 index 0000000..aaaaa83 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/DeclarationRecordsVo.java @@ -0,0 +1,62 @@ +package com.ruoyi.jjh.declaration.entity.vo; + +import com.ruoyi.jjh.declaration.entity.BmsBrandingAward; +import com.ruoyi.jjh.declaration.entity.BmsCarrierConstructionAward; +import com.ruoyi.jjh.declaration.entity.BmsCreditManagement; +import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; +import com.ruoyi.jjh.declaration.entity.BmsIndustrialInternetAward; +import com.ruoyi.jjh.declaration.entity.BmsIntegrationIndustries; +import com.ruoyi.jjh.declaration.entity.BmsLogisticsDevelopmentAward; +import com.ruoyi.jjh.declaration.entity.BmsManufacturingServicesAward; +import com.ruoyi.jjh.declaration.entity.BmsPlatformConstructionAward; +import com.ruoyi.jjh.declaration.entity.BmsSceneOpeningAward; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 璁板綍璇︽儏 + *

+ * + * @className: DeclarationRecordsVo + * @author: emiya.xie + * @create: 2023-09-05 14:58 + */ +@Data +public class DeclarationRecordsVo implements Serializable { + + private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "瀹℃牳淇℃伅") + public List approvalInfoList; + @ApiModelProperty(value = "鐢宠璁板綍") + private BmsDeclarationRecords bmsDeclarationRecords; + @ApiModelProperty(value = "浼佷笟鍩虹淇℃伅瀵硅薄") + private BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo; + @ApiModelProperty(value = "1銆侀」鐩惤鎴峰琛ュ璞") + private BmsProjectSettlementAwardQueryVo bmsProjectSettlementAwardQueryVo; + @ApiModelProperty(value = "2銆佸仛澶у仛寮哄璇︽儏瀵硅薄") + private BmsBigStrongAwardQueryVo bmsBigStrongAwardQueryVo; + @ApiModelProperty(value = "3銆佽浇浣撳缓璁惧琛ュ璞") + private BmsCarrierConstructionAward bmsCarrierConstructionAward; + @ApiModelProperty(value = "4銆佸钩鍙板缓璁惧琛ュ璞") + private BmsPlatformConstructionAward bmsPlatformConstructionAward; + @ApiModelProperty(value = "5銆佸搧鐗屾墦閫犲琛ュ璞") + private BmsBrandingAward bmsBrandingAward; + @ApiModelProperty(value = "6銆佸満鏅紑鏀惧琛ュ璞") + private BmsSceneOpeningAward bmsSceneOpeningAward; + @ApiModelProperty(value = "7銆佷俊鐢ㄧ鐞嗗琛ュ璞") + private BmsCreditManagement bmsCreditManagement; + @ApiModelProperty(value = "8銆5G+宸ヤ笟浜掕仈缃戝琛ュ璞") + private BmsIndustrialInternetAward bmsIndustrialInternetAward; + @ApiModelProperty(value = "9銆佸埗閫犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ瀵硅薄") + private BmsManufacturingServicesAward bmsManufacturingServicesAward; + @ApiModelProperty(value = "10銆佺墿娴佸彂灞曞琛ュ璞") + private BmsLogisticsDevelopmentAward bmsLogisticsDevelopmentAward; + @ApiModelProperty(value = "11銆佷袱涓氳瀺鍚堝琛ュ璞") + private BmsIntegrationIndustries bmsIntegrationIndustries; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/EnterpriseInfoTemplateVo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/EnterpriseInfoTemplateVo.java new file mode 100644 index 0000000..ca445bd --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/EnterpriseInfoTemplateVo.java @@ -0,0 +1,35 @@ +package com.ruoyi.jjh.declaration.entity.vo; + +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; +import com.ruoyi.jjh.declaration.entity.BmsProjectInfo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 浼佷笟妯℃澘淇℃伅Vo + *

+ * + * @className: EnterpriseInfoTemplateVo + * @author: emiya.xie + * @create: 2023-09-12 11:13 + */ +@Data +public class EnterpriseInfoTemplateVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "浼佷笟淇℃伅鍒楄〃") + public List enterpriseBasicList; + + @ApiModelProperty(value = "鍦ㄧ嚎妯℃澘鍒楄〃") + private List templateRecordList; + + @ApiModelProperty(value = "椤圭洰鍒楄〃") + private List projectInfoList; + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsApprovalInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsApprovalInfoMapper.java new file mode 100644 index 0000000..bd78c0e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsApprovalInfoMapper.java @@ -0,0 +1,69 @@ +package com.ruoyi.jjh.declaration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.jjh.declaration.entity.BmsApprovalInfo; +import com.ruoyi.jjh.declaration.entity.vo.BmsApprovalInfoQueryVo; + +import java.util.List; + +/** + * 瀹℃壒璁板綍淇℃伅Mapper鎺ュ彛 + * + * @author farben + * @date 2023-09-09 + */ +public interface BmsApprovalInfoMapper extends BaseMapper { + /** + * 鏌ヨ瀹℃壒璁板綍淇℃伅 + * + * @param id 瀹℃壒璁板綍淇℃伅涓婚敭 + * @return 瀹℃壒璁板綍淇℃伅 + */ + public BmsApprovalInfo selectBmsApprovalInfoById(Long id); + + /** + * 鏌ヨ瀹℃壒璁板綍淇℃伅鍒楄〃 + * + * @param bmsApprovalInfo 瀹℃壒璁板綍淇℃伅 + * @return 瀹℃壒璁板綍淇℃伅闆嗗悎 + */ + public List selectBmsApprovalInfoList(BmsApprovalInfo bmsApprovalInfo); + + /** + * 鏂板瀹℃壒璁板綍淇℃伅 + * + * @param bmsApprovalInfo 瀹℃壒璁板綍淇℃伅 + * @return 缁撴灉 + */ + public int insertBmsApprovalInfo(BmsApprovalInfo bmsApprovalInfo); + + /** + * 淇敼瀹℃壒璁板綍淇℃伅 + * + * @param bmsApprovalInfo 瀹℃壒璁板綍淇℃伅 + * @return 缁撴灉 + */ + public int updateBmsApprovalInfo(BmsApprovalInfo bmsApprovalInfo); + + /** + * 鍒犻櫎瀹℃壒璁板綍淇℃伅 + * + * @param id 瀹℃壒璁板綍淇℃伅涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsApprovalInfoById(Long id); + + /** + * 鎵归噺鍒犻櫎瀹℃壒璁板綍淇℃伅 + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsApprovalInfoByIds(Long[] ids); + + public int updateApproval(Long declarationRecordsId); + + public int updateApprovalList(List list); + + public List getApprovalInfoList(Long declarationRecordsId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsBigStrongAwardMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsBigStrongAwardMapper.java new file mode 100644 index 0000000..f01ed3b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsBigStrongAwardMapper.java @@ -0,0 +1,63 @@ +package com.ruoyi.jjh.declaration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.jjh.declaration.entity.BmsBigStrongAward; +import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo; + +import java.util.List; + +/** + * 鍋氬ぇ鍋氬己濂栬鎯匨apper鎺ュ彛 + * + * @author farben + * @date 2023-08-25 + */ +public interface BmsBigStrongAwardMapper extends BaseMapper { + /** + * 鏌ヨ鍋氬ぇ鍋氬己濂栬鎯 + * + * @param id 鍋氬ぇ鍋氬己濂栬鎯呬富閿 + * @return 鍋氬ぇ鍋氬己濂栬鎯 + */ + public BmsBigStrongAwardQueryVo selectBmsBigStrongAwardById(Long id); + + /** + * 鏌ヨ鍋氬ぇ鍋氬己濂栬鎯呭垪琛 + * + * @param bmsBigStrongAward 鍋氬ぇ鍋氬己濂栬鎯 + * @return 鍋氬ぇ鍋氬己濂栬鎯呴泦鍚 + */ + public List selectBmsBigStrongAwardList(BmsBigStrongAward bmsBigStrongAward); + + /** + * 鏂板鍋氬ぇ鍋氬己濂栬鎯 + * + * @param bmsBigStrongAward 鍋氬ぇ鍋氬己濂栬鎯 + * @return 缁撴灉 + */ + public int insertBmsBigStrongAward(BmsBigStrongAward bmsBigStrongAward); + + /** + * 淇敼鍋氬ぇ鍋氬己濂栬鎯 + * + * @param bmsBigStrongAward 鍋氬ぇ鍋氬己濂栬鎯 + * @return 缁撴灉 + */ + public int updateBmsBigStrongAward(BmsBigStrongAward bmsBigStrongAward); + + /** + * 鍒犻櫎鍋氬ぇ鍋氬己濂栬鎯 + * + * @param id 鍋氬ぇ鍋氬己濂栬鎯呬富閿 + * @return 缁撴灉 + */ + public int deleteBmsBigStrongAwardById(Long id); + + /** + * 鎵归噺鍒犻櫎鍋氬ぇ鍋氬己濂栬鎯 + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsBigStrongAwardByIds(Long[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsBrandingAwardMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsBrandingAwardMapper.java new file mode 100644 index 0000000..4c39cd1 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsBrandingAwardMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.jjh.declaration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.jjh.declaration.entity.BmsBrandingAward; + +import java.util.List; + +/** + * 鍝佺墝鎵撻犲琛apper鎺ュ彛 + * + * @author farben + * @date 2023-08-25 + */ +public interface BmsBrandingAwardMapper extends BaseMapper { + /** + * 鏌ヨ鍝佺墝鎵撻犲琛 + * + * @param id 鍝佺墝鎵撻犲琛ヤ富閿 + * @return 鍝佺墝鎵撻犲琛 + */ + public BmsBrandingAward selectBmsBrandingAwardById(Long id); + + /** + * 鏌ヨ鍝佺墝鎵撻犲琛ュ垪琛 + * + * @param bmsBrandingAward 鍝佺墝鎵撻犲琛 + * @return 鍝佺墝鎵撻犲琛ラ泦鍚 + */ + public List selectBmsBrandingAwardList(BmsBrandingAward bmsBrandingAward); + + /** + * 鏂板鍝佺墝鎵撻犲琛 + * + * @param bmsBrandingAward 鍝佺墝鎵撻犲琛 + * @return 缁撴灉 + */ + public int insertBmsBrandingAward(BmsBrandingAward bmsBrandingAward); + + /** + * 淇敼鍝佺墝鎵撻犲琛 + * + * @param bmsBrandingAward 鍝佺墝鎵撻犲琛 + * @return 缁撴灉 + */ + public int updateBmsBrandingAward(BmsBrandingAward bmsBrandingAward); + + /** + * 鍒犻櫎鍝佺墝鎵撻犲琛 + * + * @param id 鍝佺墝鎵撻犲琛ヤ富閿 + * @return 缁撴灉 + */ + public int deleteBmsBrandingAwardById(Long id); + + /** + * 鎵归噺鍒犻櫎鍝佺墝鎵撻犲琛 + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsBrandingAwardByIds(Long[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsCarrierConstructionAwardMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsCarrierConstructionAwardMapper.java new file mode 100644 index 0000000..22e4cb5 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsCarrierConstructionAwardMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.jjh.declaration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.jjh.declaration.entity.BmsCarrierConstructionAward; + +import java.util.List; + +/** + * 杞戒綋寤鸿濂栬ˉMapper鎺ュ彛 + * + * @author farben + * @date 2023-08-25 + */ +public interface BmsCarrierConstructionAwardMapper extends BaseMapper { + /** + * 鏌ヨ杞戒綋寤鸿濂栬ˉ + * + * @param id 杞戒綋寤鸿濂栬ˉ涓婚敭 + * @return 杞戒綋寤鸿濂栬ˉ + */ + public BmsCarrierConstructionAward selectBmsCarrierConstructionAwardById(Long id); + + /** + * 鏌ヨ杞戒綋寤鸿濂栬ˉ鍒楄〃 + * + * @param bmsCarrierConstructionAward 杞戒綋寤鸿濂栬ˉ + * @return 杞戒綋寤鸿濂栬ˉ闆嗗悎 + */ + public List selectBmsCarrierConstructionAwardList(BmsCarrierConstructionAward bmsCarrierConstructionAward); + + /** + * 鏂板杞戒綋寤鸿濂栬ˉ + * + * @param bmsCarrierConstructionAward 杞戒綋寤鸿濂栬ˉ + * @return 缁撴灉 + */ + public int insertBmsCarrierConstructionAward(BmsCarrierConstructionAward bmsCarrierConstructionAward); + + /** + * 淇敼杞戒綋寤鸿濂栬ˉ + * + * @param bmsCarrierConstructionAward 杞戒綋寤鸿濂栬ˉ + * @return 缁撴灉 + */ + public int updateBmsCarrierConstructionAward(BmsCarrierConstructionAward bmsCarrierConstructionAward); + + /** + * 鍒犻櫎杞戒綋寤鸿濂栬ˉ + * + * @param id 杞戒綋寤鸿濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsCarrierConstructionAwardById(Long id); + + /** + * 鎵归噺鍒犻櫎杞戒綋寤鸿濂栬ˉ + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsCarrierConstructionAwardByIds(Long[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsCreditManagementMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsCreditManagementMapper.java new file mode 100644 index 0000000..19369cd --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsCreditManagementMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.jjh.declaration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.jjh.declaration.entity.BmsCreditManagement; + +import java.util.List; + +/** + * 淇$敤绠$悊濂栬ˉMapper鎺ュ彛 + * + * @author farben + * @date 2023-09-04 + */ +public interface BmsCreditManagementMapper extends BaseMapper { + /** + * 鏌ヨ淇$敤绠$悊濂栬ˉ + * + * @param id 淇$敤绠$悊濂栬ˉ涓婚敭 + * @return 淇$敤绠$悊濂栬ˉ + */ + public BmsCreditManagement selectBmsCreditManagementById(Long id); + + /** + * 鏌ヨ淇$敤绠$悊濂栬ˉ鍒楄〃 + * + * @param bmsCreditManagement 淇$敤绠$悊濂栬ˉ + * @return 淇$敤绠$悊濂栬ˉ闆嗗悎 + */ + public List selectBmsCreditManagementList(BmsCreditManagement bmsCreditManagement); + + /** + * 鏂板淇$敤绠$悊濂栬ˉ + * + * @param bmsCreditManagement 淇$敤绠$悊濂栬ˉ + * @return 缁撴灉 + */ + public int insertBmsCreditManagement(BmsCreditManagement bmsCreditManagement); + + /** + * 淇敼淇$敤绠$悊濂栬ˉ + * + * @param bmsCreditManagement 淇$敤绠$悊濂栬ˉ + * @return 缁撴灉 + */ + public int updateBmsCreditManagement(BmsCreditManagement bmsCreditManagement); + + /** + * 鍒犻櫎淇$敤绠$悊濂栬ˉ + * + * @param id 淇$敤绠$悊濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsCreditManagementById(Long id); + + /** + * 鎵归噺鍒犻櫎淇$敤绠$悊濂栬ˉ + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsCreditManagementByIds(Long[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsDeclarationRecordsMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsDeclarationRecordsMapper.java new file mode 100644 index 0000000..bec43b5 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsDeclarationRecordsMapper.java @@ -0,0 +1,85 @@ +package com.ruoyi.jjh.declaration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; +import com.ruoyi.jjh.declaration.entity.dto.ApprovalDeclarationRecordsQueryDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsDeclarationRecordsDto; +import com.ruoyi.jjh.declaration.entity.vo.ApprovalDeclarationRecordsQueryVo; +import com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo; +import com.ruoyi.jjh.declaration.entity.vo.BmsMunicipalBureauReviewQueryVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 鍦ㄧ嚎鐢虫姤璁板綍Mapper鎺ュ彛 + * + * @author farben + * @date 2023-08-28 + */ +public interface BmsDeclarationRecordsMapper extends BaseMapper { + /** + * 鏌ヨ鍦ㄧ嚎鐢虫姤璁板綍 + * + * @param id 鍦ㄧ嚎鐢虫姤璁板綍涓婚敭 + * @return 鍦ㄧ嚎鐢虫姤璁板綍 + */ + public BmsDeclarationRecords selectBmsDeclarationRecordsById(Long id); + + /** + * 鏌ヨ鍦ㄧ嚎鐢虫姤璁板綍鍒楄〃 + * + * @param bmsDeclarationRecordsDto 鍦ㄧ嚎鐢虫姤璁板綍 + * @return 鍦ㄧ嚎鐢虫姤璁板綍闆嗗悎 + */ + public List selectBmsDeclarationRecordsList(BmsDeclarationRecordsDto bmsDeclarationRecordsDto); + + public List selectBmsDeclarationRecordsZwList(BmsDeclarationRecordsDto bmsDeclarationRecordsDto); + + public List selectMunicipalBureauReviewList(); + + public List approvalList(ApprovalDeclarationRecordsQueryDto approvalDeclarationRecordsQueryDto); + + /** + * 鏂板鍦ㄧ嚎鐢虫姤璁板綍 + * + * @param bmsDeclarationRecords 鍦ㄧ嚎鐢虫姤璁板綍 + * @return 缁撴灉 + */ + public int insertBmsDeclarationRecords(BmsDeclarationRecords bmsDeclarationRecords); + + /** + * 淇敼鍦ㄧ嚎鐢虫姤璁板綍 + * + * @param bmsDeclarationRecords 鍦ㄧ嚎鐢虫姤璁板綍 + * @return 缁撴灉 + */ + public int updateBmsDeclarationRecords(BmsDeclarationRecords bmsDeclarationRecords); + + /** + * 鍒犻櫎鍦ㄧ嚎鐢虫姤璁板綍 + * + * @param id 鍦ㄧ嚎鐢虫姤璁板綍涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsDeclarationRecordsById(Long id); + + /** + * 鎵归噺鍒犻櫎鍦ㄧ嚎鐢虫姤璁板綍 + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsDeclarationRecordsByIds(Long[] ids); + + /** + * 鏇存柊椤圭洰鍚嶇Оby Id + * + * @param id + * @param projectName + * @return {@link int} + * @author emiya.xie + * @create 2023/9/6 15:13 + */ + public int updateProjectNameById(@Param("id") Long id, @Param("projectName")String projectName,@Param("projectId")Long projectId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsEnterpriseBasicInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsEnterpriseBasicInfoMapper.java new file mode 100644 index 0000000..8055940 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsEnterpriseBasicInfoMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.jjh.declaration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; + +import java.util.List; + +/** + * 浼佷笟鍩虹淇℃伅Mapper鎺ュ彛 + * + * @author farben + * @date 2023-08-25 + */ +public interface BmsEnterpriseBasicInfoMapper extends BaseMapper { + /** + * 鏌ヨ浼佷笟鍩虹淇℃伅 + * + * @param id 浼佷笟鍩虹淇℃伅涓婚敭 + * @return 浼佷笟鍩虹淇℃伅 + */ + public BmsEnterpriseBasicInfo selectBmsEnterpriseBasicInfoById(Long id); + + /** + * 鏌ヨ浼佷笟鍩虹淇℃伅鍒楄〃 + * + * @param bmsEnterpriseBasicInfo 浼佷笟鍩虹淇℃伅 + * @return 浼佷笟鍩虹淇℃伅闆嗗悎 + */ + public List selectBmsEnterpriseBasicInfoList(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo); + + /** + * 鏂板浼佷笟鍩虹淇℃伅 + * + * @param bmsEnterpriseBasicInfo 浼佷笟鍩虹淇℃伅 + * @return 缁撴灉 + */ + public int insertBmsEnterpriseBasicInfo(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo); + + /** + * 淇敼浼佷笟鍩虹淇℃伅 + * + * @param bmsEnterpriseBasicInfo 浼佷笟鍩虹淇℃伅 + * @return 缁撴灉 + */ + public int updateBmsEnterpriseBasicInfo(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo); + + /** + * 鍒犻櫎浼佷笟鍩虹淇℃伅 + * + * @param id 浼佷笟鍩虹淇℃伅涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsEnterpriseBasicInfoById(Long id); + + /** + * 鎵归噺鍒犻櫎浼佷笟鍩虹淇℃伅 + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsEnterpriseBasicInfoByIds(Long[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsEnterpriseDirectoryMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsEnterpriseDirectoryMapper.java new file mode 100644 index 0000000..4327792 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsEnterpriseDirectoryMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.jjh.declaration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory; + +import java.util.List; + +/** + * 浼佷笟鍚嶅綍Mapper鎺ュ彛 + * + * @author farben + * @date 2023-08-31 + */ +public interface BmsEnterpriseDirectoryMapper extends BaseMapper { + /** + * 鏌ヨ浼佷笟鍚嶅綍 + * + * @param id 浼佷笟鍚嶅綍涓婚敭 + * @return 浼佷笟鍚嶅綍 + */ + public BmsEnterpriseDirectory selectBmsEnterpriseDirectoryById(Long id); + + /** + * 鏌ヨ浼佷笟鍚嶅綍鍒楄〃 + * + * @param bmsEnterpriseDirectory 浼佷笟鍚嶅綍 + * @return 浼佷笟鍚嶅綍闆嗗悎 + */ + public List selectBmsEnterpriseDirectoryList(BmsEnterpriseDirectory bmsEnterpriseDirectory); + + /** + * 鏂板浼佷笟鍚嶅綍 + * + * @param bmsEnterpriseDirectory 浼佷笟鍚嶅綍 + * @return 缁撴灉 + */ + public int insertBmsEnterpriseDirectory(BmsEnterpriseDirectory bmsEnterpriseDirectory); + + /** + * 淇敼浼佷笟鍚嶅綍 + * + * @param bmsEnterpriseDirectory 浼佷笟鍚嶅綍 + * @return 缁撴灉 + */ + public int updateBmsEnterpriseDirectory(BmsEnterpriseDirectory bmsEnterpriseDirectory); + + /** + * 鍒犻櫎浼佷笟鍚嶅綍 + * + * @param id 浼佷笟鍚嶅綍涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsEnterpriseDirectoryById(Long id); + + /** + * 鎵归噺鍒犻櫎浼佷笟鍚嶅綍 + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsEnterpriseDirectoryByIds(Long[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsFieldInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsFieldInfoMapper.java new file mode 100644 index 0000000..053d961 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsFieldInfoMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.jjh.declaration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.jjh.declaration.entity.BmsFieldInfo; + +import java.util.List; + +/** + * 妯℃澘瀛楁濉啓璇︽儏Mapper鎺ュ彛 + * + * @author farben + * @date 2023-09-04 + */ +public interface BmsFieldInfoMapper extends BaseMapper { + /** + * 鏌ヨ妯℃澘瀛楁濉啓璇︽儏 + * + * @param id 妯℃澘瀛楁濉啓璇︽儏涓婚敭 + * @return 妯℃澘瀛楁濉啓璇︽儏 + */ + public BmsFieldInfo selectBmsFieldInfoById(Long id); + + /** + * 鏌ヨ妯℃澘瀛楁濉啓璇︽儏鍒楄〃 + * + * @param bmsFieldInfo 妯℃澘瀛楁濉啓璇︽儏 + * @return 妯℃澘瀛楁濉啓璇︽儏闆嗗悎 + */ + public List selectBmsFieldInfoList(BmsFieldInfo bmsFieldInfo); + + /** + * 鏂板妯℃澘瀛楁濉啓璇︽儏 + * + * @param bmsFieldInfo 妯℃澘瀛楁濉啓璇︽儏 + * @return 缁撴灉 + */ + public int insertBmsFieldInfo(BmsFieldInfo bmsFieldInfo); + + /** + * 淇敼妯℃澘瀛楁濉啓璇︽儏 + * + * @param bmsFieldInfo 妯℃澘瀛楁濉啓璇︽儏 + * @return 缁撴灉 + */ + public int updateBmsFieldInfo(BmsFieldInfo bmsFieldInfo); + + /** + * 鍒犻櫎妯℃澘瀛楁濉啓璇︽儏 + * + * @param id 妯℃澘瀛楁濉啓璇︽儏涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsFieldInfoById(Long id); + + /** + * 鎵归噺鍒犻櫎妯℃澘瀛楁濉啓璇︽儏 + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsFieldInfoByIds(Long[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsFileInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsFileInfoMapper.java new file mode 100644 index 0000000..cb8e83d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsFileInfoMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.jjh.declaration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.jjh.declaration.entity.BmsFileInfo; + +import java.util.List; + +/** + * 鏂囦欢瀛樺偍璇存槑璇︽儏Mapper鎺ュ彛 + * + * @author farben + * @date 2023-09-04 + */ +public interface BmsFileInfoMapper extends BaseMapper { + /** + * 鏌ヨ鏂囦欢瀛樺偍璇存槑璇︽儏 + * + * @param id 鏂囦欢瀛樺偍璇存槑璇︽儏涓婚敭 + * @return 鏂囦欢瀛樺偍璇存槑璇︽儏 + */ + public BmsFileInfo selectBmsFileInfoById(Long id); + + /** + * 鏌ヨ鏂囦欢瀛樺偍璇存槑璇︽儏鍒楄〃 + * + * @param bmsFileInfo 鏂囦欢瀛樺偍璇存槑璇︽儏 + * @return 鏂囦欢瀛樺偍璇存槑璇︽儏闆嗗悎 + */ + public List selectBmsFileInfoList(BmsFileInfo bmsFileInfo); + + /** + * 鏂板鏂囦欢瀛樺偍璇存槑璇︽儏 + * + * @param bmsFileInfo 鏂囦欢瀛樺偍璇存槑璇︽儏 + * @return 缁撴灉 + */ + public int insertBmsFileInfo(BmsFileInfo bmsFileInfo); + + /** + * 淇敼鏂囦欢瀛樺偍璇存槑璇︽儏 + * + * @param bmsFileInfo 鏂囦欢瀛樺偍璇存槑璇︽儏 + * @return 缁撴灉 + */ + public int updateBmsFileInfo(BmsFileInfo bmsFileInfo); + + /** + * 鍒犻櫎鏂囦欢瀛樺偍璇存槑璇︽儏 + * + * @param id 鏂囦欢瀛樺偍璇存槑璇︽儏涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsFileInfoById(Long id); + + /** + * 鎵归噺鍒犻櫎鏂囦欢瀛樺偍璇存槑璇︽儏 + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsFileInfoByIds(Long[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsFundingDetailMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsFundingDetailMapper.java new file mode 100644 index 0000000..8b6c679 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsFundingDetailMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.jjh.declaration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.jjh.declaration.entity.BmsFundingDetail; + +import java.util.List; + +/** + * 璧勯噾淇℃伅璇︽儏Mapper鎺ュ彛 + * + * @author farben + * @date 2023-09-04 + */ +public interface BmsFundingDetailMapper extends BaseMapper { + /** + * 鏌ヨ璧勯噾淇℃伅璇︽儏 + * + * @param id 璧勯噾淇℃伅璇︽儏涓婚敭 + * @return 璧勯噾淇℃伅璇︽儏 + */ + public BmsFundingDetail selectBmsFundingDetailById(Long id); + + /** + * 鏌ヨ璧勯噾淇℃伅璇︽儏鍒楄〃 + * + * @param bmsFundingDetail 璧勯噾淇℃伅璇︽儏 + * @return 璧勯噾淇℃伅璇︽儏闆嗗悎 + */ + public List selectBmsFundingDetailList(BmsFundingDetail bmsFundingDetail); + + /** + * 鏂板璧勯噾淇℃伅璇︽儏 + * + * @param bmsFundingDetail 璧勯噾淇℃伅璇︽儏 + * @return 缁撴灉 + */ + public int insertBmsFundingDetail(BmsFundingDetail bmsFundingDetail); + + /** + * 淇敼璧勯噾淇℃伅璇︽儏 + * + * @param bmsFundingDetail 璧勯噾淇℃伅璇︽儏 + * @return 缁撴灉 + */ + public int updateBmsFundingDetail(BmsFundingDetail bmsFundingDetail); + + /** + * 鍒犻櫎璧勯噾淇℃伅璇︽儏 + * + * @param id 璧勯噾淇℃伅璇︽儏涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsFundingDetailById(Long id); + + /** + * 鎵归噺鍒犻櫎璧勯噾淇℃伅璇︽儏 + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsFundingDetailByIds(Long[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsIndustrialInternetAwardMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsIndustrialInternetAwardMapper.java new file mode 100644 index 0000000..9034f49 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsIndustrialInternetAwardMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.jjh.declaration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.jjh.declaration.entity.BmsIndustrialInternetAward; + +import java.util.List; + +/** + * 5G+宸ヤ笟浜掕仈缃戝琛apper鎺ュ彛 + * + * @author farben + * @date 2023-08-25 + */ +public interface BmsIndustrialInternetAwardMapper extends BaseMapper { + /** + * 鏌ヨ5G+宸ヤ笟浜掕仈缃戝琛 + * + * @param id 5G+宸ヤ笟浜掕仈缃戝琛ヤ富閿 + * @return 5G+宸ヤ笟浜掕仈缃戝琛 + */ + public BmsIndustrialInternetAward selectBmsIndustrialInternetAwardById(Long id); + + /** + * 鏌ヨ5G+宸ヤ笟浜掕仈缃戝琛ュ垪琛 + * + * @param bmsIndustrialInternetAward 5G+宸ヤ笟浜掕仈缃戝琛 + * @return 5G+宸ヤ笟浜掕仈缃戝琛ラ泦鍚 + */ + public List selectBmsIndustrialInternetAwardList(BmsIndustrialInternetAward bmsIndustrialInternetAward); + + /** + * 鏂板5G+宸ヤ笟浜掕仈缃戝琛 + * + * @param bmsIndustrialInternetAward 5G+宸ヤ笟浜掕仈缃戝琛 + * @return 缁撴灉 + */ + public int insertBmsIndustrialInternetAward(BmsIndustrialInternetAward bmsIndustrialInternetAward); + + /** + * 淇敼5G+宸ヤ笟浜掕仈缃戝琛 + * + * @param bmsIndustrialInternetAward 5G+宸ヤ笟浜掕仈缃戝琛 + * @return 缁撴灉 + */ + public int updateBmsIndustrialInternetAward(BmsIndustrialInternetAward bmsIndustrialInternetAward); + + /** + * 鍒犻櫎5G+宸ヤ笟浜掕仈缃戝琛 + * + * @param id 5G+宸ヤ笟浜掕仈缃戝琛ヤ富閿 + * @return 缁撴灉 + */ + public int deleteBmsIndustrialInternetAwardById(Long id); + + /** + * 鎵归噺鍒犻櫎5G+宸ヤ笟浜掕仈缃戝琛 + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsIndustrialInternetAwardByIds(Long[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsIntegrationIndustriesMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsIntegrationIndustriesMapper.java new file mode 100644 index 0000000..a17f394 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsIntegrationIndustriesMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.jjh.declaration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.jjh.declaration.entity.BmsIntegrationIndustries; + +import java.util.List; + +/** + * 涓や笟铻嶅悎濂栬ˉMapper鎺ュ彛 + * + * @author farben + * @date 2023-09-04 + */ +public interface BmsIntegrationIndustriesMapper extends BaseMapper { + /** + * 鏌ヨ涓や笟铻嶅悎濂栬ˉ + * + * @param id 涓や笟铻嶅悎濂栬ˉ涓婚敭 + * @return 涓や笟铻嶅悎濂栬ˉ + */ + public BmsIntegrationIndustries selectBmsIntegrationIndustriesById(Long id); + + /** + * 鏌ヨ涓や笟铻嶅悎濂栬ˉ鍒楄〃 + * + * @param bmsIntegrationIndustries 涓や笟铻嶅悎濂栬ˉ + * @return 涓や笟铻嶅悎濂栬ˉ闆嗗悎 + */ + public List selectBmsIntegrationIndustriesList(BmsIntegrationIndustries bmsIntegrationIndustries); + + /** + * 鏂板涓や笟铻嶅悎濂栬ˉ + * + * @param bmsIntegrationIndustries 涓や笟铻嶅悎濂栬ˉ + * @return 缁撴灉 + */ + public int insertBmsIntegrationIndustries(BmsIntegrationIndustries bmsIntegrationIndustries); + + /** + * 淇敼涓や笟铻嶅悎濂栬ˉ + * + * @param bmsIntegrationIndustries 涓や笟铻嶅悎濂栬ˉ + * @return 缁撴灉 + */ + public int updateBmsIntegrationIndustries(BmsIntegrationIndustries bmsIntegrationIndustries); + + /** + * 鍒犻櫎涓や笟铻嶅悎濂栬ˉ + * + * @param id 涓や笟铻嶅悎濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsIntegrationIndustriesById(Long id); + + /** + * 鎵归噺鍒犻櫎涓や笟铻嶅悎濂栬ˉ + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsIntegrationIndustriesByIds(Long[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsLogisticsDevelopmentAwardMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsLogisticsDevelopmentAwardMapper.java new file mode 100644 index 0000000..cff8189 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsLogisticsDevelopmentAwardMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.jjh.declaration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.jjh.declaration.entity.BmsLogisticsDevelopmentAward; + +import java.util.List; + +/** + * 鐗╂祦鍙戝睍濂栬ˉMapper鎺ュ彛 + * + * @author farben + * @date 2023-08-25 + */ +public interface BmsLogisticsDevelopmentAwardMapper extends BaseMapper { + /** + * 鏌ヨ鐗╂祦鍙戝睍濂栬ˉ + * + * @param id 鐗╂祦鍙戝睍濂栬ˉ涓婚敭 + * @return 鐗╂祦鍙戝睍濂栬ˉ + */ + public BmsLogisticsDevelopmentAward selectBmsLogisticsDevelopmentAwardById(Long id); + + /** + * 鏌ヨ鐗╂祦鍙戝睍濂栬ˉ鍒楄〃 + * + * @param bmsLogisticsDevelopmentAward 鐗╂祦鍙戝睍濂栬ˉ + * @return 鐗╂祦鍙戝睍濂栬ˉ闆嗗悎 + */ + public List selectBmsLogisticsDevelopmentAwardList(BmsLogisticsDevelopmentAward bmsLogisticsDevelopmentAward); + + /** + * 鏂板鐗╂祦鍙戝睍濂栬ˉ + * + * @param bmsLogisticsDevelopmentAward 鐗╂祦鍙戝睍濂栬ˉ + * @return 缁撴灉 + */ + public int insertBmsLogisticsDevelopmentAward(BmsLogisticsDevelopmentAward bmsLogisticsDevelopmentAward); + + /** + * 淇敼鐗╂祦鍙戝睍濂栬ˉ + * + * @param bmsLogisticsDevelopmentAward 鐗╂祦鍙戝睍濂栬ˉ + * @return 缁撴灉 + */ + public int updateBmsLogisticsDevelopmentAward(BmsLogisticsDevelopmentAward bmsLogisticsDevelopmentAward); + + /** + * 鍒犻櫎鐗╂祦鍙戝睍濂栬ˉ + * + * @param id 鐗╂祦鍙戝睍濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsLogisticsDevelopmentAwardById(Long id); + + /** + * 鎵归噺鍒犻櫎鐗╂祦鍙戝睍濂栬ˉ + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsLogisticsDevelopmentAwardByIds(Long[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsManufacturingServicesAwardMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsManufacturingServicesAwardMapper.java new file mode 100644 index 0000000..76d883c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsManufacturingServicesAwardMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.jjh.declaration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.jjh.declaration.entity.BmsManufacturingServicesAward; + +import java.util.List; + +/** + * 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉMapper鎺ュ彛 + * + * @author farben + * @date 2023-08-25 + */ +public interface BmsManufacturingServicesAwardMapper extends BaseMapper { + /** + * 鏌ヨ鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + * + * @param id 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ涓婚敭 + * @return 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + */ + public BmsManufacturingServicesAward selectBmsManufacturingServicesAwardById(Long id); + + /** + * 鏌ヨ鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ鍒楄〃 + * + * @param bmsManufacturingServicesAward 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + * @return 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ闆嗗悎 + */ + public List selectBmsManufacturingServicesAwardList(BmsManufacturingServicesAward bmsManufacturingServicesAward); + + /** + * 鏂板鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + * + * @param bmsManufacturingServicesAward 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + * @return 缁撴灉 + */ + public int insertBmsManufacturingServicesAward(BmsManufacturingServicesAward bmsManufacturingServicesAward); + + /** + * 淇敼鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + * + * @param bmsManufacturingServicesAward 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + * @return 缁撴灉 + */ + public int updateBmsManufacturingServicesAward(BmsManufacturingServicesAward bmsManufacturingServicesAward); + + /** + * 鍒犻櫎鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + * + * @param id 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsManufacturingServicesAwardById(Long id); + + /** + * 鎵归噺鍒犻櫎鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsManufacturingServicesAwardByIds(Long[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsPlatformConstructionAwardMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsPlatformConstructionAwardMapper.java new file mode 100644 index 0000000..18be636 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsPlatformConstructionAwardMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.jjh.declaration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.jjh.declaration.entity.BmsPlatformConstructionAward; + +import java.util.List; + +/** + * 骞冲彴寤鸿濂栬ˉMapper鎺ュ彛 + * + * @author farben + * @date 2023-08-25 + */ +public interface BmsPlatformConstructionAwardMapper extends BaseMapper { + /** + * 鏌ヨ骞冲彴寤鸿濂栬ˉ + * + * @param id 骞冲彴寤鸿濂栬ˉ涓婚敭 + * @return 骞冲彴寤鸿濂栬ˉ + */ + public BmsPlatformConstructionAward selectBmsPlatformConstructionAwardById(Long id); + + /** + * 鏌ヨ骞冲彴寤鸿濂栬ˉ鍒楄〃 + * + * @param bmsPlatformConstructionAward 骞冲彴寤鸿濂栬ˉ + * @return 骞冲彴寤鸿濂栬ˉ闆嗗悎 + */ + public List selectBmsPlatformConstructionAwardList(BmsPlatformConstructionAward bmsPlatformConstructionAward); + + /** + * 鏂板骞冲彴寤鸿濂栬ˉ + * + * @param bmsPlatformConstructionAward 骞冲彴寤鸿濂栬ˉ + * @return 缁撴灉 + */ + public int insertBmsPlatformConstructionAward(BmsPlatformConstructionAward bmsPlatformConstructionAward); + + /** + * 淇敼骞冲彴寤鸿濂栬ˉ + * + * @param bmsPlatformConstructionAward 骞冲彴寤鸿濂栬ˉ + * @return 缁撴灉 + */ + public int updateBmsPlatformConstructionAward(BmsPlatformConstructionAward bmsPlatformConstructionAward); + + /** + * 鍒犻櫎骞冲彴寤鸿濂栬ˉ + * + * @param id 骞冲彴寤鸿濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsPlatformConstructionAwardById(Long id); + + /** + * 鎵归噺鍒犻櫎骞冲彴寤鸿濂栬ˉ + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsPlatformConstructionAwardByIds(Long[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsProcessInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsProcessInfoMapper.java new file mode 100644 index 0000000..cffc9c8 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsProcessInfoMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.jjh.declaration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.jjh.declaration.entity.BmsProcessInfo; + +import java.util.List; + +/** + * 瀹℃壒娴佺▼Mapper鎺ュ彛 + * + * @author farben + * @date 2023-09-09 + */ +public interface BmsProcessInfoMapper extends BaseMapper { + /** + * 鏌ヨ瀹℃壒娴佺▼ + * + * @param id 瀹℃壒娴佺▼涓婚敭 + * @return 瀹℃壒娴佺▼ + */ + public BmsProcessInfo selectBmsProcessInfoById(Long id); + + /** + * 鏌ヨ瀹℃壒娴佺▼鍒楄〃 + * + * @param bmsProcessInfo 瀹℃壒娴佺▼ + * @return 瀹℃壒娴佺▼闆嗗悎 + */ + public List selectBmsProcessInfoList(BmsProcessInfo bmsProcessInfo); + + /** + * 鏂板瀹℃壒娴佺▼ + * + * @param bmsProcessInfo 瀹℃壒娴佺▼ + * @return 缁撴灉 + */ + public int insertBmsProcessInfo(BmsProcessInfo bmsProcessInfo); + + /** + * 淇敼瀹℃壒娴佺▼ + * + * @param bmsProcessInfo 瀹℃壒娴佺▼ + * @return 缁撴灉 + */ + public int updateBmsProcessInfo(BmsProcessInfo bmsProcessInfo); + + /** + * 鍒犻櫎瀹℃壒娴佺▼ + * + * @param id 瀹℃壒娴佺▼涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsProcessInfoById(Long id); + + /** + * 鎵归噺鍒犻櫎瀹℃壒娴佺▼ + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsProcessInfoByIds(Long[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsProjectInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsProjectInfoMapper.java new file mode 100644 index 0000000..39746aa --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsProjectInfoMapper.java @@ -0,0 +1,65 @@ +package com.ruoyi.jjh.declaration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.jjh.declaration.entity.BmsProjectInfo; + +import java.util.List; + +/** + * 椤圭洰鍩烘湰淇℃伅Mapper鎺ュ彛 + * + * @author farben + * @date 2023-09-09 + */ +public interface BmsProjectInfoMapper extends BaseMapper { + /** + * 鏌ヨ椤圭洰鍩烘湰淇℃伅 + * + * @param id 椤圭洰鍩烘湰淇℃伅涓婚敭 + * @return 椤圭洰鍩烘湰淇℃伅 + */ + public BmsProjectInfo selectBmsProjectInfoById(Long id); + + /** + * 鏌ヨ椤圭洰鍩烘湰淇℃伅鍒楄〃 + * + * @param bmsProjectInfo 椤圭洰鍩烘湰淇℃伅 + * @return 椤圭洰鍩烘湰淇℃伅闆嗗悎 + */ + public List selectBmsProjectInfoList(BmsProjectInfo bmsProjectInfo); + + /** + * 鏂板椤圭洰鍩烘湰淇℃伅 + * + * @param bmsProjectInfo 椤圭洰鍩烘湰淇℃伅 + * @return 缁撴灉 + */ + public int insertBmsProjectInfo(BmsProjectInfo bmsProjectInfo); + + /** + * 淇敼椤圭洰鍩烘湰淇℃伅 + * + * @param bmsProjectInfo 椤圭洰鍩烘湰淇℃伅 + * @return 缁撴灉 + */ + public int updateBmsProjectInfo(BmsProjectInfo bmsProjectInfo); + + /** + * 鍒犻櫎椤圭洰鍩烘湰淇℃伅 + * + * @param id 椤圭洰鍩烘湰淇℃伅涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsProjectInfoById(Long id); + + /** + * 鎵归噺鍒犻櫎椤圭洰鍩烘湰淇℃伅 + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsProjectInfoByIds(Long[] ids); + + + public BmsProjectInfo getProjectInfo(Long templateRecordId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsProjectSettlementAwardMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsProjectSettlementAwardMapper.java new file mode 100644 index 0000000..11f5bae --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsProjectSettlementAwardMapper.java @@ -0,0 +1,63 @@ +package com.ruoyi.jjh.declaration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.jjh.declaration.entity.BmsProjectSettlementAward; +import com.ruoyi.jjh.declaration.entity.vo.BmsProjectSettlementAwardQueryVo; + +import java.util.List; + +/** + * 椤圭洰钀芥埛濂栬ˉMapper鎺ュ彛 + * + * @author farben + * @date 2023-08-25 + */ +public interface BmsProjectSettlementAwardMapper extends BaseMapper { + /** + * 鏌ヨ椤圭洰钀芥埛濂栬ˉ + * + * @param id 椤圭洰钀芥埛濂栬ˉ涓婚敭 + * @return 椤圭洰钀芥埛濂栬ˉ + */ + public BmsProjectSettlementAwardQueryVo selectBmsProjectSettlementAwardById(Long id); + + /** + * 鏌ヨ椤圭洰钀芥埛濂栬ˉ鍒楄〃 + * + * @param bmsProjectSettlementAward 椤圭洰钀芥埛濂栬ˉ + * @return 椤圭洰钀芥埛濂栬ˉ闆嗗悎 + */ + public List selectBmsProjectSettlementAwardList(BmsProjectSettlementAward bmsProjectSettlementAward); + + /** + * 鏂板椤圭洰钀芥埛濂栬ˉ + * + * @param bmsProjectSettlementAward 椤圭洰钀芥埛濂栬ˉ + * @return 缁撴灉 + */ + public int insertBmsProjectSettlementAward(BmsProjectSettlementAward bmsProjectSettlementAward); + + /** + * 淇敼椤圭洰钀芥埛濂栬ˉ + * + * @param bmsProjectSettlementAward 椤圭洰钀芥埛濂栬ˉ + * @return 缁撴灉 + */ + public int updateBmsProjectSettlementAward(BmsProjectSettlementAward bmsProjectSettlementAward); + + /** + * 鍒犻櫎椤圭洰钀芥埛濂栬ˉ + * + * @param id 椤圭洰钀芥埛濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsProjectSettlementAwardById(Long id); + + /** + * 鎵归噺鍒犻櫎椤圭洰钀芥埛濂栬ˉ + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsProjectSettlementAwardByIds(Long[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsSceneOpeningAwardMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsSceneOpeningAwardMapper.java new file mode 100644 index 0000000..d01eba2 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsSceneOpeningAwardMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.jjh.declaration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.jjh.declaration.entity.BmsSceneOpeningAward; + +import java.util.List; + +/** + * 鍦烘櫙寮鏀惧琛apper鎺ュ彛 + * + * @author farben + * @date 2023-08-25 + */ +public interface BmsSceneOpeningAwardMapper extends BaseMapper { + /** + * 鏌ヨ鍦烘櫙寮鏀惧琛 + * + * @param id 鍦烘櫙寮鏀惧琛ヤ富閿 + * @return 鍦烘櫙寮鏀惧琛 + */ + public BmsSceneOpeningAward selectBmsSceneOpeningAwardById(Long id); + + /** + * 鏌ヨ鍦烘櫙寮鏀惧琛ュ垪琛 + * + * @param bmsSceneOpeningAward 鍦烘櫙寮鏀惧琛 + * @return 鍦烘櫙寮鏀惧琛ラ泦鍚 + */ + public List selectBmsSceneOpeningAwardList(BmsSceneOpeningAward bmsSceneOpeningAward); + + /** + * 鏂板鍦烘櫙寮鏀惧琛 + * + * @param bmsSceneOpeningAward 鍦烘櫙寮鏀惧琛 + * @return 缁撴灉 + */ + public int insertBmsSceneOpeningAward(BmsSceneOpeningAward bmsSceneOpeningAward); + + /** + * 淇敼鍦烘櫙寮鏀惧琛 + * + * @param bmsSceneOpeningAward 鍦烘櫙寮鏀惧琛 + * @return 缁撴灉 + */ + public int updateBmsSceneOpeningAward(BmsSceneOpeningAward bmsSceneOpeningAward); + + /** + * 鍒犻櫎鍦烘櫙寮鏀惧琛 + * + * @param id 鍦烘櫙寮鏀惧琛ヤ富閿 + * @return 缁撴灉 + */ + public int deleteBmsSceneOpeningAwardById(Long id); + + /** + * 鎵归噺鍒犻櫎鍦烘櫙寮鏀惧琛 + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsSceneOpeningAwardByIds(Long[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsTemplateInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsTemplateInfoMapper.java new file mode 100644 index 0000000..639aab1 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsTemplateInfoMapper.java @@ -0,0 +1,69 @@ +package com.ruoyi.jjh.declaration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.jjh.declaration.entity.BmsTemplateInfo; +import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateInfoQueryVo; + +import java.util.List; + +/** + * 鐢虫姤妯℃澘淇℃伅Mapper鎺ュ彛 + * + * @author farben + * @date 2023-08-25 + */ +public interface BmsTemplateInfoMapper extends BaseMapper { + /** + * 鏌ヨ鐢虫姤妯℃澘淇℃伅 + * + * @param id 鐢虫姤妯℃澘淇℃伅涓婚敭 + * @return 鐢虫姤妯℃澘淇℃伅 + */ + public BmsTemplateInfo selectBmsTemplateInfoById(Long id); + + /** + * 鏌ヨ鐢虫姤妯℃澘淇℃伅鍒楄〃 + * + * @param bmsTemplateInfo 鐢虫姤妯℃澘淇℃伅 + * @return 鐢虫姤妯℃澘淇℃伅闆嗗悎 + */ + public List selectBmsTemplateInfoList(BmsTemplateInfo bmsTemplateInfo); + /** + * 鏌ヨ鐢虫姤妯℃澘淇℃伅鍒楄〃 + * + * @param bmsTemplateInfo 鐢虫姤妯℃澘淇℃伅 + * @return 鐢虫姤妯℃澘淇℃伅闆嗗悎 + */ + public List templateInfoList(BmsTemplateInfo bmsTemplateInfo); + /** + * 鏂板鐢虫姤妯℃澘淇℃伅 + * + * @param bmsTemplateInfo 鐢虫姤妯℃澘淇℃伅 + * @return 缁撴灉 + */ + public int insertBmsTemplateInfo(BmsTemplateInfo bmsTemplateInfo); + + /** + * 淇敼鐢虫姤妯℃澘淇℃伅 + * + * @param bmsTemplateInfo 鐢虫姤妯℃澘淇℃伅 + * @return 缁撴灉 + */ + public int updateBmsTemplateInfo(BmsTemplateInfo bmsTemplateInfo); + + /** + * 鍒犻櫎鐢虫姤妯℃澘淇℃伅 + * + * @param id 鐢虫姤妯℃澘淇℃伅涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsTemplateInfoById(Long id); + + /** + * 鎵归噺鍒犻櫎鐢虫姤妯℃澘淇℃伅 + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsTemplateInfoByIds(Long[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsTemplateRecordMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsTemplateRecordMapper.java new file mode 100644 index 0000000..4e8f895 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsTemplateRecordMapper.java @@ -0,0 +1,75 @@ +package com.ruoyi.jjh.declaration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord; +import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateQueryDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordQueryDto; +import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordQueryVo; +import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 鍦ㄧ嚎妯℃澘Mapper鎺ュ彛 + * + * @author farben + * @date 2023-09-07 + */ +public interface BmsTemplateRecordMapper extends BaseMapper { + /** + * 鏌ヨ鍦ㄧ嚎妯℃澘 + * + * @param id 鍦ㄧ嚎妯℃澘涓婚敭 + * @return 鍦ㄧ嚎妯℃澘 + */ + public BmsTemplateRecord selectBmsTemplateRecordById(Long id); + + public BmsTemplateRecordVo selectBmsTemplateRecordVoById(Long id); + + /** + * 鏌ヨ鍦ㄧ嚎妯℃澘鍒楄〃 + * + * @param bmsTemplateRecord 鍦ㄧ嚎妯℃澘 + * @return 鍦ㄧ嚎妯℃澘闆嗗悎 + */ + public List selectBmsTemplateRecordList(BmsTemplateRecord bmsTemplateRecord); + + /** + * 鏂板鍦ㄧ嚎妯℃澘 + * + * @param bmsTemplateRecord 鍦ㄧ嚎妯℃澘 + * @return 缁撴灉 + */ + public int insertBmsTemplateRecord(BmsTemplateRecord bmsTemplateRecord); + + /** + * 淇敼鍦ㄧ嚎妯℃澘 + * + * @param bmsTemplateRecord 鍦ㄧ嚎妯℃澘 + * @return 缁撴灉 + */ + public int updateBmsTemplateRecord(BmsTemplateRecord bmsTemplateRecord); + + /** + * 鍒犻櫎鍦ㄧ嚎妯℃澘 + * + * @param id 鍦ㄧ嚎妯℃澘涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsTemplateRecordById(Long id); + + /** + * 鎵归噺鍒犻櫎鍦ㄧ嚎妯℃澘 + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsTemplateRecordByIds(Long[] ids); + + public List selectTemplateRecordVo(BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto); + + public List selectTemplateRecordList(@Param("creditCode") String creditCode); + + public List selectBmsTemplateNameList(BmsTemplateQueryDto bmsTemplateQueryDto); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BsmFundingInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BsmFundingInfoMapper.java new file mode 100644 index 0000000..1a36a09 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BsmFundingInfoMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.jjh.declaration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.jjh.declaration.entity.BsmFundingInfo; + +import java.util.List; + +/** + * 璧勯噾淇℃伅Mapper鎺ュ彛 + * + * @author farben + * @date 2023-08-25 + */ +public interface BsmFundingInfoMapper extends BaseMapper { + /** + * 鏌ヨ璧勯噾淇℃伅 + * + * @param id 璧勯噾淇℃伅涓婚敭 + * @return 璧勯噾淇℃伅 + */ + public BsmFundingInfo selectBsmFundingInfoById(Long id); + + /** + * 鏌ヨ璧勯噾淇℃伅鍒楄〃 + * + * @param bsmFundingInfo 璧勯噾淇℃伅 + * @return 璧勯噾淇℃伅闆嗗悎 + */ + public List selectBsmFundingInfoList(BsmFundingInfo bsmFundingInfo); + + /** + * 鏂板璧勯噾淇℃伅 + * + * @param bsmFundingInfo 璧勯噾淇℃伅 + * @return 缁撴灉 + */ + public int insertBsmFundingInfo(BsmFundingInfo bsmFundingInfo); + + /** + * 淇敼璧勯噾淇℃伅 + * + * @param bsmFundingInfo 璧勯噾淇℃伅 + * @return 缁撴灉 + */ + public int updateBsmFundingInfo(BsmFundingInfo bsmFundingInfo); + + /** + * 鍒犻櫎璧勯噾淇℃伅 + * + * @param id 璧勯噾淇℃伅涓婚敭 + * @return 缁撴灉 + */ + public int deleteBsmFundingInfoById(Long id); + + /** + * 鎵归噺鍒犻櫎璧勯噾淇℃伅 + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBsmFundingInfoByIds(Long[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsApprovalInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsApprovalInfoService.java new file mode 100644 index 0000000..c637829 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsApprovalInfoService.java @@ -0,0 +1,69 @@ +package com.ruoyi.jjh.declaration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.declaration.entity.BmsApprovalInfo; +import com.ruoyi.jjh.declaration.entity.vo.BmsApprovalInfoQueryVo; + +import java.util.List; + +/** + * 瀹℃壒璁板綍淇℃伅Service鎺ュ彛 + * + * @author farben + * @date 2023-09-09 + */ +public interface IBmsApprovalInfoService extends IService { + /** + * 鏌ヨ瀹℃壒璁板綍淇℃伅 + * + * @param id 瀹℃壒璁板綍淇℃伅涓婚敭 + * @return 瀹℃壒璁板綍淇℃伅 + */ + public BmsApprovalInfo selectBmsApprovalInfoById(Long id); + + /** + * 鏌ヨ瀹℃壒璁板綍淇℃伅鍒楄〃 + * + * @param bmsApprovalInfo 瀹℃壒璁板綍淇℃伅 + * @return 瀹℃壒璁板綍淇℃伅闆嗗悎 + */ + public List selectBmsApprovalInfoList(BmsApprovalInfo bmsApprovalInfo); + + /** + * 鏂板瀹℃壒璁板綍淇℃伅 + * + * @param bmsApprovalInfo 瀹℃壒璁板綍淇℃伅 + * @return 缁撴灉 + */ + public int insertBmsApprovalInfo(BmsApprovalInfo bmsApprovalInfo); + + /** + * 淇敼瀹℃壒璁板綍淇℃伅 + * + * @param bmsApprovalInfo 瀹℃壒璁板綍淇℃伅 + * @return 缁撴灉 + */ + public int updateBmsApprovalInfo(BmsApprovalInfo bmsApprovalInfo); + + /** + * 鎵归噺鍒犻櫎瀹℃壒璁板綍淇℃伅 + * + * @param ids 闇瑕佸垹闄ょ殑瀹℃壒璁板綍淇℃伅涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsApprovalInfoByIds(Long[] ids); + + public int updateApproval(Long declarationRecordsId); + + public int updateApprovalList(List recordsId); + + /** + * 鍒犻櫎瀹℃壒璁板綍淇℃伅淇℃伅 + * + * @param id 瀹℃壒璁板綍淇℃伅涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsApprovalInfoById(Long id); + + public List getApprovalInfoList(Long declarationRecordsId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsBigStrongAwardService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsBigStrongAwardService.java new file mode 100644 index 0000000..3c83a34 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsBigStrongAwardService.java @@ -0,0 +1,65 @@ +package com.ruoyi.jjh.declaration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.declaration.entity.BmsBigStrongAward; +import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardUpdateDto; +import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo; + +import java.util.List; + +/** + * 鍋氬ぇ鍋氬己濂栬鎯匰ervice鎺ュ彛 + * + * @author farben + * @date 2023-08-25 + */ +public interface IBmsBigStrongAwardService extends IService { + /** + * 鏌ヨ鍋氬ぇ鍋氬己濂栬鎯 + * + * @param id 鍋氬ぇ鍋氬己濂栬鎯呬富閿 + * @return 鍋氬ぇ鍋氬己濂栬鎯 + */ + public BmsBigStrongAwardQueryVo selectBmsBigStrongAwardById(Long id); + + /** + * 鏌ヨ鍋氬ぇ鍋氬己濂栬鎯呭垪琛 + * + * @param bmsBigStrongAward 鍋氬ぇ鍋氬己濂栬鎯 + * @return 鍋氬ぇ鍋氬己濂栬鎯呴泦鍚 + */ + public List selectBmsBigStrongAwardList(BmsBigStrongAward bmsBigStrongAward); + + /** + * 鏂板鍋氬ぇ鍋氬己濂栬鎯 + * + * @param bmsBigStrongAwardAddDto 鍋氬ぇ鍋氬己濂栬鎯 + * @return 缁撴灉 + */ + public int insertBmsBigStrongAward(BmsBigStrongAwardAddDto bmsBigStrongAwardAddDto); + + /** + * 淇敼鍋氬ぇ鍋氬己濂栬鎯 + * + * @param bmsBigStrongAwardUpdateDto 鍋氬ぇ鍋氬己濂栬鎯 + * @return 缁撴灉 + */ + public int updateBmsBigStrongAward(BmsBigStrongAwardUpdateDto bmsBigStrongAwardUpdateDto); + + /** + * 鎵归噺鍒犻櫎鍋氬ぇ鍋氬己濂栬鎯 + * + * @param ids 闇瑕佸垹闄ょ殑鍋氬ぇ鍋氬己濂栬鎯呬富閿泦鍚 + * @return 缁撴灉 + */ + public int deleteBmsBigStrongAwardByIds(Long[] ids); + + /** + * 鍒犻櫎鍋氬ぇ鍋氬己濂栬鎯呬俊鎭 + * + * @param id 鍋氬ぇ鍋氬己濂栬鎯呬富閿 + * @return 缁撴灉 + */ + public int deleteBmsBigStrongAwardById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsBrandingAwardService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsBrandingAwardService.java new file mode 100644 index 0000000..81c29d7 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsBrandingAwardService.java @@ -0,0 +1,64 @@ +package com.ruoyi.jjh.declaration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.declaration.entity.BmsBrandingAward; +import com.ruoyi.jjh.declaration.entity.dto.BmsBrandingAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsBrandingAwardUpdateDto; + +import java.util.List; + +/** + * 鍝佺墝鎵撻犲琛ervice鎺ュ彛 + * + * @author farben + * @date 2023-08-25 + */ +public interface IBmsBrandingAwardService extends IService { + /** + * 鏌ヨ鍝佺墝鎵撻犲琛 + * + * @param id 鍝佺墝鎵撻犲琛ヤ富閿 + * @return 鍝佺墝鎵撻犲琛 + */ + public BmsBrandingAward selectBmsBrandingAwardById(Long id); + + /** + * 鏌ヨ鍝佺墝鎵撻犲琛ュ垪琛 + * + * @param bmsBrandingAward 鍝佺墝鎵撻犲琛 + * @return 鍝佺墝鎵撻犲琛ラ泦鍚 + */ + public List selectBmsBrandingAwardList(BmsBrandingAward bmsBrandingAward); + + /** + * 鏂板鍝佺墝鎵撻犲琛 + * + * @param bmsBrandingAwardAddDto 鍝佺墝鎵撻犲琛 + * @return 缁撴灉 + */ + public int insertBmsBrandingAward(BmsBrandingAwardAddDto bmsBrandingAwardAddDto); + + /** + * 淇敼鍝佺墝鎵撻犲琛 + * + * @param bmsBrandingAwardUpdateDto 鍝佺墝鎵撻犲琛 + * @return 缁撴灉 + */ + public int updateBmsBrandingAward(BmsBrandingAwardUpdateDto bmsBrandingAwardUpdateDto); + + /** + * 鎵归噺鍒犻櫎鍝佺墝鎵撻犲琛 + * + * @param ids 闇瑕佸垹闄ょ殑鍝佺墝鎵撻犲琛ヤ富閿泦鍚 + * @return 缁撴灉 + */ + public int deleteBmsBrandingAwardByIds(Long[] ids); + + /** + * 鍒犻櫎鍝佺墝鎵撻犲琛ヤ俊鎭 + * + * @param id 鍝佺墝鎵撻犲琛ヤ富閿 + * @return 缁撴灉 + */ + public int deleteBmsBrandingAwardById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsCarrierConstructionAwardService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsCarrierConstructionAwardService.java new file mode 100644 index 0000000..1c8903e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsCarrierConstructionAwardService.java @@ -0,0 +1,64 @@ +package com.ruoyi.jjh.declaration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.declaration.entity.BmsCarrierConstructionAward; +import com.ruoyi.jjh.declaration.entity.dto.BmsCarrierConstructionAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsCarrierConstructionAwardUpdateDto; + +import java.util.List; + +/** + * 杞戒綋寤鸿濂栬ˉService鎺ュ彛 + * + * @author farben + * @date 2023-08-25 + */ +public interface IBmsCarrierConstructionAwardService extends IService { + /** + * 鏌ヨ杞戒綋寤鸿濂栬ˉ + * + * @param id 杞戒綋寤鸿濂栬ˉ涓婚敭 + * @return 杞戒綋寤鸿濂栬ˉ + */ + public BmsCarrierConstructionAward selectBmsCarrierConstructionAwardById(Long id); + + /** + * 鏌ヨ杞戒綋寤鸿濂栬ˉ鍒楄〃 + * + * @param bmsCarrierConstructionAward 杞戒綋寤鸿濂栬ˉ + * @return 杞戒綋寤鸿濂栬ˉ闆嗗悎 + */ + public List selectBmsCarrierConstructionAwardList(BmsCarrierConstructionAward bmsCarrierConstructionAward); + + /** + * 鏂板杞戒綋寤鸿濂栬ˉ + * + * @param bmsCarrierConstructionAwardAddDto 杞戒綋寤鸿濂栬ˉ + * @return 缁撴灉 + */ + public int insertBmsCarrierConstructionAward(BmsCarrierConstructionAwardAddDto bmsCarrierConstructionAwardAddDto); + + /** + * 淇敼杞戒綋寤鸿濂栬ˉ + * + * @param bmsCarrierConstructionAwardUpdateDto 杞戒綋寤鸿濂栬ˉ + * @return 缁撴灉 + */ + public int updateBmsCarrierConstructionAward(BmsCarrierConstructionAwardUpdateDto bmsCarrierConstructionAwardUpdateDto); + + /** + * 鎵归噺鍒犻櫎杞戒綋寤鸿濂栬ˉ + * + * @param ids 闇瑕佸垹闄ょ殑杞戒綋寤鸿濂栬ˉ涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsCarrierConstructionAwardByIds(Long[] ids); + + /** + * 鍒犻櫎杞戒綋寤鸿濂栬ˉ淇℃伅 + * + * @param id 杞戒綋寤鸿濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsCarrierConstructionAwardById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsCreditManagementService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsCreditManagementService.java new file mode 100644 index 0000000..e5d3f89 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsCreditManagementService.java @@ -0,0 +1,64 @@ +package com.ruoyi.jjh.declaration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.declaration.entity.BmsCreditManagement; +import com.ruoyi.jjh.declaration.entity.dto.BmsCreditManagementAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsCreditManagementUpdateDto; + +import java.util.List; + +/** + * 淇$敤绠$悊濂栬ˉService鎺ュ彛 + * + * @author farben + * @date 2023-09-04 + */ +public interface IBmsCreditManagementService extends IService { + /** + * 鏌ヨ淇$敤绠$悊濂栬ˉ + * + * @param id 淇$敤绠$悊濂栬ˉ涓婚敭 + * @return 淇$敤绠$悊濂栬ˉ + */ + public BmsCreditManagement selectBmsCreditManagementById(Long id); + + /** + * 鏌ヨ淇$敤绠$悊濂栬ˉ鍒楄〃 + * + * @param bmsCreditManagement 淇$敤绠$悊濂栬ˉ + * @return 淇$敤绠$悊濂栬ˉ闆嗗悎 + */ + public List selectBmsCreditManagementList(BmsCreditManagement bmsCreditManagement); + + /** + * 鏂板淇$敤绠$悊濂栬ˉ + * + * @param bmsCreditManagementAddDto 淇$敤绠$悊濂栬ˉ + * @return 缁撴灉 + */ + public int insertBmsCreditManagement(BmsCreditManagementAddDto bmsCreditManagementAddDto); + + /** + * 淇敼淇$敤绠$悊濂栬ˉ + * + * @param bmsCreditManagementUpdateDto 淇$敤绠$悊濂栬ˉ + * @return 缁撴灉 + */ + public int updateBmsCreditManagement(BmsCreditManagementUpdateDto bmsCreditManagementUpdateDto); + + /** + * 鎵归噺鍒犻櫎淇$敤绠$悊濂栬ˉ + * + * @param ids 闇瑕佸垹闄ょ殑淇$敤绠$悊濂栬ˉ涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsCreditManagementByIds(Long[] ids); + + /** + * 鍒犻櫎淇$敤绠$悊濂栬ˉ淇℃伅 + * + * @param id 淇$敤绠$悊濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsCreditManagementById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsDeclarationRecordsService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsDeclarationRecordsService.java new file mode 100644 index 0000000..bab862f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsDeclarationRecordsService.java @@ -0,0 +1,107 @@ +package com.ruoyi.jjh.declaration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; +import com.ruoyi.jjh.declaration.entity.dto.ApprovalDeclarationRecordsQueryDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsApprovalInfoUpdateDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsDeclarationRecordsAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsDeclarationRecordsDto; +import com.ruoyi.jjh.declaration.entity.dto.MunicipalReviewDto; +import com.ruoyi.jjh.declaration.entity.vo.ApprovalDeclarationRecordsQueryVo; +import com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo; +import com.ruoyi.jjh.declaration.entity.vo.BmsMunicipalBureauReviewQueryVo; +import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo; + +import java.util.List; + +/** + * 鍦ㄧ嚎鐢虫姤璁板綍Service鎺ュ彛 + * + * @author farben + * @date 2023-08-28 + */ +public interface IBmsDeclarationRecordsService extends IService { + /** + * 鏌ヨ鍦ㄧ嚎鐢虫姤璁板綍 + * + * @param id 鍦ㄧ嚎鐢虫姤璁板綍涓婚敭 + * @return 鍦ㄧ嚎鐢虫姤璁板綍 + */ + public DeclarationRecordsVo selectBmsDeclarationRecordsById(Long id); + + /** + * 鏌ヨ鍦ㄧ嚎鐢虫姤璁板綍鍒楄〃 + * + * @param bmsDeclarationRecordsDto 鍦ㄧ嚎鐢虫姤璁板綍 + * @return 鍦ㄧ嚎鐢虫姤璁板綍闆嗗悎 + */ + public List selectBmsDeclarationRecordsList(BmsDeclarationRecordsDto bmsDeclarationRecordsDto); + + public List selectBmsDeclarationRecordsZwList(BmsDeclarationRecordsDto bmsDeclarationRecordsDto); + + + public List selectMunicipalBureauReviewList(); + + public List approvalList(ApprovalDeclarationRecordsQueryDto approvalDeclarationRecordsQueryDto); + + public int updateBmsApprovalInfo(BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto); + + public int updateApprovalInfo(BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto); + + /** + * 鏂板鍦ㄧ嚎鐢虫姤璁板綍 + * + * @param bmsDeclarationRecordsAddDto 鍦ㄧ嚎鐢虫姤璁板綍 + * @return 缁撴灉 + */ + public int insertBmsDeclarationRecords(BmsDeclarationRecordsAddDto bmsDeclarationRecordsAddDto); + + /** + * 淇敼鍦ㄧ嚎鐢虫姤璁板綍 + * + * @param bmsDeclarationRecords 鍦ㄧ嚎鐢虫姤璁板綍 + * @return 缁撴灉 + */ + public int updateBmsDeclarationRecords(BmsDeclarationRecords bmsDeclarationRecords); + + /** + * 甯傜骇璇勫畾纭 + * + * @param municipalReviewDto + * @return {@link int} + * @author emiya.xie + * @create 2023/9/13 17:18 + */ + public int municipalReview(MunicipalReviewDto municipalReviewDto); + + public int municipalReviewNew(MunicipalReviewDto municipalReviewDto); + + /** + * 鎵归噺鍒犻櫎鍦ㄧ嚎鐢虫姤璁板綍 + * + * @param ids 闇瑕佸垹闄ょ殑鍦ㄧ嚎鐢虫姤璁板綍涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsDeclarationRecordsByIds(Long[] ids); + + /** + * 鍒犻櫎鍦ㄧ嚎鐢虫姤璁板綍淇℃伅 + * + * @param id 鍦ㄧ嚎鐢虫姤璁板綍涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsDeclarationRecordsById(Long id); + + /** + * 鏇存柊椤圭洰鍚嶇Оby Id + * + * @param id + * @param projectName + * @return {@link int} + * @author emiya.xie + * @create 2023/9/6 15:13 + */ + public int updateProjectNameById(Long id, String projectName, Long projectId); + + public int updateDeclarationRecords(Long declarationId, Long projectId, String projectName, Long status); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsEnterpriseBasicInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsEnterpriseBasicInfoService.java new file mode 100644 index 0000000..859498f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsEnterpriseBasicInfoService.java @@ -0,0 +1,62 @@ +package com.ruoyi.jjh.declaration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; + +import java.util.List; + +/** + * 浼佷笟鍩虹淇℃伅Service鎺ュ彛 + * + * @author farben + * @date 2023-08-25 + */ +public interface IBmsEnterpriseBasicInfoService extends IService { + /** + * 鏌ヨ浼佷笟鍩虹淇℃伅 + * + * @param id 浼佷笟鍩虹淇℃伅涓婚敭 + * @return 浼佷笟鍩虹淇℃伅 + */ + public BmsEnterpriseBasicInfo selectBmsEnterpriseBasicInfoById(Long id); + + /** + * 鏌ヨ浼佷笟鍩虹淇℃伅鍒楄〃 + * + * @param bmsEnterpriseBasicInfo 浼佷笟鍩虹淇℃伅 + * @return 浼佷笟鍩虹淇℃伅闆嗗悎 + */ + public List selectBmsEnterpriseBasicInfoList(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo); + + /** + * 鏂板浼佷笟鍩虹淇℃伅 + * + * @param bmsEnterpriseBasicInfo 浼佷笟鍩虹淇℃伅 + * @return 缁撴灉 + */ + public int insertBmsEnterpriseBasicInfo(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo); + + /** + * 淇敼浼佷笟鍩虹淇℃伅 + * + * @param bmsEnterpriseBasicInfo 浼佷笟鍩虹淇℃伅 + * @return 缁撴灉 + */ + public int updateBmsEnterpriseBasicInfo(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo); + + /** + * 鎵归噺鍒犻櫎浼佷笟鍩虹淇℃伅 + * + * @param ids 闇瑕佸垹闄ょ殑浼佷笟鍩虹淇℃伅涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsEnterpriseBasicInfoByIds(Long[] ids); + + /** + * 鍒犻櫎浼佷笟鍩虹淇℃伅淇℃伅 + * + * @param id 浼佷笟鍩虹淇℃伅涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsEnterpriseBasicInfoById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsEnterpriseDirectoryService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsEnterpriseDirectoryService.java new file mode 100644 index 0000000..e327545 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsEnterpriseDirectoryService.java @@ -0,0 +1,62 @@ +package com.ruoyi.jjh.declaration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory; + +import java.util.List; + +/** + * 浼佷笟鍚嶅綍Service鎺ュ彛 + * + * @author farben + * @date 2023-08-31 + */ +public interface IBmsEnterpriseDirectoryService extends IService { + /** + * 鏌ヨ浼佷笟鍚嶅綍 + * + * @param id 浼佷笟鍚嶅綍涓婚敭 + * @return 浼佷笟鍚嶅綍 + */ + public BmsEnterpriseDirectory selectBmsEnterpriseDirectoryById(Long id); + + /** + * 鏌ヨ浼佷笟鍚嶅綍鍒楄〃 + * + * @param bmsEnterpriseDirectory 浼佷笟鍚嶅綍 + * @return 浼佷笟鍚嶅綍闆嗗悎 + */ + public List selectBmsEnterpriseDirectoryList(BmsEnterpriseDirectory bmsEnterpriseDirectory); + + /** + * 鏂板浼佷笟鍚嶅綍 + * + * @param bmsEnterpriseDirectory 浼佷笟鍚嶅綍 + * @return 缁撴灉 + */ + public int insertBmsEnterpriseDirectory(BmsEnterpriseDirectory bmsEnterpriseDirectory); + + /** + * 淇敼浼佷笟鍚嶅綍 + * + * @param bmsEnterpriseDirectory 浼佷笟鍚嶅綍 + * @return 缁撴灉 + */ + public int updateBmsEnterpriseDirectory(BmsEnterpriseDirectory bmsEnterpriseDirectory); + + /** + * 鎵归噺鍒犻櫎浼佷笟鍚嶅綍 + * + * @param ids 闇瑕佸垹闄ょ殑浼佷笟鍚嶅綍涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsEnterpriseDirectoryByIds(Long[] ids); + + /** + * 鍒犻櫎浼佷笟鍚嶅綍淇℃伅 + * + * @param id 浼佷笟鍚嶅綍涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsEnterpriseDirectoryById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsFieldInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsFieldInfoService.java new file mode 100644 index 0000000..930a3b9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsFieldInfoService.java @@ -0,0 +1,62 @@ +package com.ruoyi.jjh.declaration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.declaration.entity.BmsFieldInfo; + +import java.util.List; + +/** + * 妯℃澘瀛楁濉啓璇︽儏Service鎺ュ彛 + * + * @author farben + * @date 2023-09-04 + */ +public interface IBmsFieldInfoService extends IService { + /** + * 鏌ヨ妯℃澘瀛楁濉啓璇︽儏 + * + * @param id 妯℃澘瀛楁濉啓璇︽儏涓婚敭 + * @return 妯℃澘瀛楁濉啓璇︽儏 + */ + public BmsFieldInfo selectBmsFieldInfoById(Long id); + + /** + * 鏌ヨ妯℃澘瀛楁濉啓璇︽儏鍒楄〃 + * + * @param bmsFieldInfo 妯℃澘瀛楁濉啓璇︽儏 + * @return 妯℃澘瀛楁濉啓璇︽儏闆嗗悎 + */ + public List selectBmsFieldInfoList(BmsFieldInfo bmsFieldInfo); + + /** + * 鏂板妯℃澘瀛楁濉啓璇︽儏 + * + * @param bmsFieldInfo 妯℃澘瀛楁濉啓璇︽儏 + * @return 缁撴灉 + */ + public int insertBmsFieldInfo(BmsFieldInfo bmsFieldInfo); + + /** + * 淇敼妯℃澘瀛楁濉啓璇︽儏 + * + * @param bmsFieldInfo 妯℃澘瀛楁濉啓璇︽儏 + * @return 缁撴灉 + */ + public int updateBmsFieldInfo(BmsFieldInfo bmsFieldInfo); + + /** + * 鎵归噺鍒犻櫎妯℃澘瀛楁濉啓璇︽儏 + * + * @param ids 闇瑕佸垹闄ょ殑妯℃澘瀛楁濉啓璇︽儏涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsFieldInfoByIds(Long[] ids); + + /** + * 鍒犻櫎妯℃澘瀛楁濉啓璇︽儏淇℃伅 + * + * @param id 妯℃澘瀛楁濉啓璇︽儏涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsFieldInfoById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsFileInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsFileInfoService.java new file mode 100644 index 0000000..44496b5 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsFileInfoService.java @@ -0,0 +1,62 @@ +package com.ruoyi.jjh.declaration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.declaration.entity.BmsFileInfo; + +import java.util.List; + +/** + * 鏂囦欢瀛樺偍璇存槑璇︽儏Service鎺ュ彛 + * + * @author farben + * @date 2023-09-04 + */ +public interface IBmsFileInfoService extends IService { + /** + * 鏌ヨ鏂囦欢瀛樺偍璇存槑璇︽儏 + * + * @param id 鏂囦欢瀛樺偍璇存槑璇︽儏涓婚敭 + * @return 鏂囦欢瀛樺偍璇存槑璇︽儏 + */ + public BmsFileInfo selectBmsFileInfoById(Long id); + + /** + * 鏌ヨ鏂囦欢瀛樺偍璇存槑璇︽儏鍒楄〃 + * + * @param bmsFileInfo 鏂囦欢瀛樺偍璇存槑璇︽儏 + * @return 鏂囦欢瀛樺偍璇存槑璇︽儏闆嗗悎 + */ + public List selectBmsFileInfoList(BmsFileInfo bmsFileInfo); + + /** + * 鏂板鏂囦欢瀛樺偍璇存槑璇︽儏 + * + * @param bmsFileInfo 鏂囦欢瀛樺偍璇存槑璇︽儏 + * @return 缁撴灉 + */ + public int insertBmsFileInfo(BmsFileInfo bmsFileInfo); + + /** + * 淇敼鏂囦欢瀛樺偍璇存槑璇︽儏 + * + * @param bmsFileInfo 鏂囦欢瀛樺偍璇存槑璇︽儏 + * @return 缁撴灉 + */ + public int updateBmsFileInfo(BmsFileInfo bmsFileInfo); + + /** + * 鎵归噺鍒犻櫎鏂囦欢瀛樺偍璇存槑璇︽儏 + * + * @param ids 闇瑕佸垹闄ょ殑鏂囦欢瀛樺偍璇存槑璇︽儏涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsFileInfoByIds(Long[] ids); + + /** + * 鍒犻櫎鏂囦欢瀛樺偍璇存槑璇︽儏淇℃伅 + * + * @param id 鏂囦欢瀛樺偍璇存槑璇︽儏涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsFileInfoById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsFundingDetailService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsFundingDetailService.java new file mode 100644 index 0000000..ac56dfd --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsFundingDetailService.java @@ -0,0 +1,62 @@ +package com.ruoyi.jjh.declaration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.declaration.entity.BmsFundingDetail; + +import java.util.List; + +/** + * 璧勯噾淇℃伅璇︽儏Service鎺ュ彛 + * + * @author farben + * @date 2023-09-04 + */ +public interface IBmsFundingDetailService extends IService { + /** + * 鏌ヨ璧勯噾淇℃伅璇︽儏 + * + * @param id 璧勯噾淇℃伅璇︽儏涓婚敭 + * @return 璧勯噾淇℃伅璇︽儏 + */ + public BmsFundingDetail selectBmsFundingDetailById(Long id); + + /** + * 鏌ヨ璧勯噾淇℃伅璇︽儏鍒楄〃 + * + * @param bmsFundingDetail 璧勯噾淇℃伅璇︽儏 + * @return 璧勯噾淇℃伅璇︽儏闆嗗悎 + */ + public List selectBmsFundingDetailList(BmsFundingDetail bmsFundingDetail); + + /** + * 鏂板璧勯噾淇℃伅璇︽儏 + * + * @param bmsFundingDetail 璧勯噾淇℃伅璇︽儏 + * @return 缁撴灉 + */ + public int insertBmsFundingDetail(BmsFundingDetail bmsFundingDetail); + + /** + * 淇敼璧勯噾淇℃伅璇︽儏 + * + * @param bmsFundingDetail 璧勯噾淇℃伅璇︽儏 + * @return 缁撴灉 + */ + public int updateBmsFundingDetail(BmsFundingDetail bmsFundingDetail); + + /** + * 鎵归噺鍒犻櫎璧勯噾淇℃伅璇︽儏 + * + * @param ids 闇瑕佸垹闄ょ殑璧勯噾淇℃伅璇︽儏涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsFundingDetailByIds(Long[] ids); + + /** + * 鍒犻櫎璧勯噾淇℃伅璇︽儏淇℃伅 + * + * @param id 璧勯噾淇℃伅璇︽儏涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsFundingDetailById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsIndustrialInternetAwardService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsIndustrialInternetAwardService.java new file mode 100644 index 0000000..615a4aa --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsIndustrialInternetAwardService.java @@ -0,0 +1,64 @@ +package com.ruoyi.jjh.declaration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.declaration.entity.BmsIndustrialInternetAward; +import com.ruoyi.jjh.declaration.entity.dto.BmsIndustrialInternetAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsIndustrialInternetAwardUpdateDto; + +import java.util.List; + +/** + * 5G+宸ヤ笟浜掕仈缃戝琛ervice鎺ュ彛 + * + * @author farben + * @date 2023-08-25 + */ +public interface IBmsIndustrialInternetAwardService extends IService { + /** + * 鏌ヨ5G+宸ヤ笟浜掕仈缃戝琛 + * + * @param id 5G+宸ヤ笟浜掕仈缃戝琛ヤ富閿 + * @return 5G+宸ヤ笟浜掕仈缃戝琛 + */ + public BmsIndustrialInternetAward selectBmsIndustrialInternetAwardById(Long id); + + /** + * 鏌ヨ5G+宸ヤ笟浜掕仈缃戝琛ュ垪琛 + * + * @param bmsIndustrialInternetAward 5G+宸ヤ笟浜掕仈缃戝琛 + * @return 5G+宸ヤ笟浜掕仈缃戝琛ラ泦鍚 + */ + public List selectBmsIndustrialInternetAwardList(BmsIndustrialInternetAward bmsIndustrialInternetAward); + + /** + * 鏂板5G+宸ヤ笟浜掕仈缃戝琛 + * + * @param bmsIndustrialInternetAwardAddDto 5G+宸ヤ笟浜掕仈缃戝琛 + * @return 缁撴灉 + */ + public int insertBmsIndustrialInternetAward(BmsIndustrialInternetAwardAddDto bmsIndustrialInternetAwardAddDto); + + /** + * 淇敼5G+宸ヤ笟浜掕仈缃戝琛 + * + * @param bmsIndustrialInternetAwardUpdateDto 5G+宸ヤ笟浜掕仈缃戝琛 + * @return 缁撴灉 + */ + public int updateBmsIndustrialInternetAward(BmsIndustrialInternetAwardUpdateDto bmsIndustrialInternetAwardUpdateDto); + + /** + * 鎵归噺鍒犻櫎5G+宸ヤ笟浜掕仈缃戝琛 + * + * @param ids 闇瑕佸垹闄ょ殑5G+宸ヤ笟浜掕仈缃戝琛ヤ富閿泦鍚 + * @return 缁撴灉 + */ + public int deleteBmsIndustrialInternetAwardByIds(Long[] ids); + + /** + * 鍒犻櫎5G+宸ヤ笟浜掕仈缃戝琛ヤ俊鎭 + * + * @param id 5G+宸ヤ笟浜掕仈缃戝琛ヤ富閿 + * @return 缁撴灉 + */ + public int deleteBmsIndustrialInternetAwardById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsIntegrationIndustriesService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsIntegrationIndustriesService.java new file mode 100644 index 0000000..87dcb29 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsIntegrationIndustriesService.java @@ -0,0 +1,64 @@ +package com.ruoyi.jjh.declaration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.declaration.entity.BmsIntegrationIndustries; +import com.ruoyi.jjh.declaration.entity.dto.BmsIntegrationIndustriesAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsIntegrationIndustriesUpdateDto; + +import java.util.List; + +/** + * 涓や笟铻嶅悎濂栬ˉService鎺ュ彛 + * + * @author farben + * @date 2023-09-04 + */ +public interface IBmsIntegrationIndustriesService extends IService { + /** + * 鏌ヨ涓や笟铻嶅悎濂栬ˉ + * + * @param id 涓や笟铻嶅悎濂栬ˉ涓婚敭 + * @return 涓や笟铻嶅悎濂栬ˉ + */ + public BmsIntegrationIndustries selectBmsIntegrationIndustriesById(Long id); + + /** + * 鏌ヨ涓や笟铻嶅悎濂栬ˉ鍒楄〃 + * + * @param bmsIntegrationIndustries 涓や笟铻嶅悎濂栬ˉ + * @return 涓や笟铻嶅悎濂栬ˉ闆嗗悎 + */ + public List selectBmsIntegrationIndustriesList(BmsIntegrationIndustries bmsIntegrationIndustries); + + /** + * 鏂板涓や笟铻嶅悎濂栬ˉ + * + * @param bmsIntegrationIndustriesAddDto 涓や笟铻嶅悎濂栬ˉ + * @return 缁撴灉 + */ + public int insertBmsIntegrationIndustries(BmsIntegrationIndustriesAddDto bmsIntegrationIndustriesAddDto); + + /** + * 淇敼涓や笟铻嶅悎濂栬ˉ + * + * @param bmsIntegrationIndustriesUpdateDto 涓や笟铻嶅悎濂栬ˉ + * @return 缁撴灉 + */ + public int updateBmsIntegrationIndustries(BmsIntegrationIndustriesUpdateDto bmsIntegrationIndustriesUpdateDto); + + /** + * 鎵归噺鍒犻櫎涓や笟铻嶅悎濂栬ˉ + * + * @param ids 闇瑕佸垹闄ょ殑涓や笟铻嶅悎濂栬ˉ涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsIntegrationIndustriesByIds(Long[] ids); + + /** + * 鍒犻櫎涓や笟铻嶅悎濂栬ˉ淇℃伅 + * + * @param id 涓や笟铻嶅悎濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsIntegrationIndustriesById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsLogisticsDevelopmentAwardService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsLogisticsDevelopmentAwardService.java new file mode 100644 index 0000000..6a1300b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsLogisticsDevelopmentAwardService.java @@ -0,0 +1,64 @@ +package com.ruoyi.jjh.declaration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.declaration.entity.BmsLogisticsDevelopmentAward; +import com.ruoyi.jjh.declaration.entity.dto.BmsLogisticsDevelopmentAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsLogisticsDevelopmentAwardUpdateDto; + +import java.util.List; + +/** + * 鐗╂祦鍙戝睍濂栬ˉService鎺ュ彛 + * + * @author farben + * @date 2023-08-25 + */ +public interface IBmsLogisticsDevelopmentAwardService extends IService { + /** + * 鏌ヨ鐗╂祦鍙戝睍濂栬ˉ + * + * @param id 鐗╂祦鍙戝睍濂栬ˉ涓婚敭 + * @return 鐗╂祦鍙戝睍濂栬ˉ + */ + public BmsLogisticsDevelopmentAward selectBmsLogisticsDevelopmentAwardById(Long id); + + /** + * 鏌ヨ鐗╂祦鍙戝睍濂栬ˉ鍒楄〃 + * + * @param bmsLogisticsDevelopmentAward 鐗╂祦鍙戝睍濂栬ˉ + * @return 鐗╂祦鍙戝睍濂栬ˉ闆嗗悎 + */ + public List selectBmsLogisticsDevelopmentAwardList(BmsLogisticsDevelopmentAward bmsLogisticsDevelopmentAward); + + /** + * 鏂板鐗╂祦鍙戝睍濂栬ˉ + * + * @param bmsLogisticsDevelopmentAwardAddDto 鐗╂祦鍙戝睍濂栬ˉ + * @return 缁撴灉 + */ + public int insertBmsLogisticsDevelopmentAward(BmsLogisticsDevelopmentAwardAddDto bmsLogisticsDevelopmentAwardAddDto); + + /** + * 淇敼鐗╂祦鍙戝睍濂栬ˉ + * + * @param bmsLogisticsDevelopmentAwardUpdateDto 鐗╂祦鍙戝睍濂栬ˉ + * @return 缁撴灉 + */ + public int updateBmsLogisticsDevelopmentAward(BmsLogisticsDevelopmentAwardUpdateDto bmsLogisticsDevelopmentAwardUpdateDto); + + /** + * 鎵归噺鍒犻櫎鐗╂祦鍙戝睍濂栬ˉ + * + * @param ids 闇瑕佸垹闄ょ殑鐗╂祦鍙戝睍濂栬ˉ涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsLogisticsDevelopmentAwardByIds(Long[] ids); + + /** + * 鍒犻櫎鐗╂祦鍙戝睍濂栬ˉ淇℃伅 + * + * @param id 鐗╂祦鍙戝睍濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsLogisticsDevelopmentAwardById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsManufacturingServicesAwardService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsManufacturingServicesAwardService.java new file mode 100644 index 0000000..7b08c55 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsManufacturingServicesAwardService.java @@ -0,0 +1,64 @@ +package com.ruoyi.jjh.declaration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.declaration.entity.BmsManufacturingServicesAward; +import com.ruoyi.jjh.declaration.entity.dto.BmsManufacturingServicesAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsManufacturingServicesAwardUpdateDto; + +import java.util.List; + +/** + * 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉService鎺ュ彛 + * + * @author farben + * @date 2023-08-25 + */ +public interface IBmsManufacturingServicesAwardService extends IService { + /** + * 鏌ヨ鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + * + * @param id 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ涓婚敭 + * @return 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + */ + public BmsManufacturingServicesAward selectBmsManufacturingServicesAwardById(Long id); + + /** + * 鏌ヨ鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ鍒楄〃 + * + * @param bmsManufacturingServicesAward 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + * @return 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ闆嗗悎 + */ + public List selectBmsManufacturingServicesAwardList(BmsManufacturingServicesAward bmsManufacturingServicesAward); + + /** + * 鏂板鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + * + * @param bmsManufacturingServicesAwardAddDto 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + * @return 缁撴灉 + */ + public int insertBmsManufacturingServicesAward(BmsManufacturingServicesAwardAddDto bmsManufacturingServicesAwardAddDto); + + /** + * 淇敼鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + * + * @param bmsManufacturingServicesAwardUpdateDto 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + * @return 缁撴灉 + */ + public int updateBmsManufacturingServicesAward(BmsManufacturingServicesAwardUpdateDto bmsManufacturingServicesAwardUpdateDto); + + /** + * 鎵归噺鍒犻櫎鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + * + * @param ids 闇瑕佸垹闄ょ殑鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsManufacturingServicesAwardByIds(Long[] ids); + + /** + * 鍒犻櫎鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ淇℃伅 + * + * @param id 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsManufacturingServicesAwardById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsPlatformConstructionAwardService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsPlatformConstructionAwardService.java new file mode 100644 index 0000000..d611e74 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsPlatformConstructionAwardService.java @@ -0,0 +1,64 @@ +package com.ruoyi.jjh.declaration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.declaration.entity.BmsPlatformConstructionAward; +import com.ruoyi.jjh.declaration.entity.dto.BmsPlatformConstructionAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsPlatformConstructionAwardUpdateDto; + +import java.util.List; + +/** + * 骞冲彴寤鸿濂栬ˉService鎺ュ彛 + * + * @author farben + * @date 2023-08-25 + */ +public interface IBmsPlatformConstructionAwardService extends IService { + /** + * 鏌ヨ骞冲彴寤鸿濂栬ˉ + * + * @param id 骞冲彴寤鸿濂栬ˉ涓婚敭 + * @return 骞冲彴寤鸿濂栬ˉ + */ + public BmsPlatformConstructionAward selectBmsPlatformConstructionAwardById(Long id); + + /** + * 鏌ヨ骞冲彴寤鸿濂栬ˉ鍒楄〃 + * + * @param bmsPlatformConstructionAward 骞冲彴寤鸿濂栬ˉ + * @return 骞冲彴寤鸿濂栬ˉ闆嗗悎 + */ + public List selectBmsPlatformConstructionAwardList(BmsPlatformConstructionAward bmsPlatformConstructionAward); + + /** + * 鏂板骞冲彴寤鸿濂栬ˉ + * + * @param bmsPlatformConstructionAwardAddDto 骞冲彴寤鸿濂栬ˉ + * @return 缁撴灉 + */ + public int insertBmsPlatformConstructionAward(BmsPlatformConstructionAwardAddDto bmsPlatformConstructionAwardAddDto); + + /** + * 淇敼骞冲彴寤鸿濂栬ˉ + * + * @param bmsPlatformConstructionAwardUpdateDto 骞冲彴寤鸿濂栬ˉ + * @return 缁撴灉 + */ + public int updateBmsPlatformConstructionAward(BmsPlatformConstructionAwardUpdateDto bmsPlatformConstructionAwardUpdateDto); + + /** + * 鎵归噺鍒犻櫎骞冲彴寤鸿濂栬ˉ + * + * @param ids 闇瑕佸垹闄ょ殑骞冲彴寤鸿濂栬ˉ涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsPlatformConstructionAwardByIds(Long[] ids); + + /** + * 鍒犻櫎骞冲彴寤鸿濂栬ˉ淇℃伅 + * + * @param id 骞冲彴寤鸿濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsPlatformConstructionAwardById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsProcessInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsProcessInfoService.java new file mode 100644 index 0000000..c2ea2c1 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsProcessInfoService.java @@ -0,0 +1,62 @@ +package com.ruoyi.jjh.declaration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.declaration.entity.BmsProcessInfo; + +import java.util.List; + +/** + * 瀹℃壒娴佺▼Service鎺ュ彛 + * + * @author farben + * @date 2023-09-09 + */ +public interface IBmsProcessInfoService extends IService { + /** + * 鏌ヨ瀹℃壒娴佺▼ + * + * @param id 瀹℃壒娴佺▼涓婚敭 + * @return 瀹℃壒娴佺▼ + */ + public BmsProcessInfo selectBmsProcessInfoById(Long id); + + /** + * 鏌ヨ瀹℃壒娴佺▼鍒楄〃 + * + * @param bmsProcessInfo 瀹℃壒娴佺▼ + * @return 瀹℃壒娴佺▼闆嗗悎 + */ + public List selectBmsProcessInfoList(BmsProcessInfo bmsProcessInfo); + + /** + * 鏂板瀹℃壒娴佺▼ + * + * @param bmsProcessInfo 瀹℃壒娴佺▼ + * @return 缁撴灉 + */ + public int insertBmsProcessInfo(BmsProcessInfo bmsProcessInfo); + + /** + * 淇敼瀹℃壒娴佺▼ + * + * @param bmsProcessInfo 瀹℃壒娴佺▼ + * @return 缁撴灉 + */ + public int updateBmsProcessInfo(BmsProcessInfo bmsProcessInfo); + + /** + * 鎵归噺鍒犻櫎瀹℃壒娴佺▼ + * + * @param ids 闇瑕佸垹闄ょ殑瀹℃壒娴佺▼涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsProcessInfoByIds(Long[] ids); + + /** + * 鍒犻櫎瀹℃壒娴佺▼淇℃伅 + * + * @param id 瀹℃壒娴佺▼涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsProcessInfoById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsProjectInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsProjectInfoService.java new file mode 100644 index 0000000..94075e1 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsProjectInfoService.java @@ -0,0 +1,65 @@ +package com.ruoyi.jjh.declaration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.declaration.entity.BmsProjectInfo; + +import java.util.List; + +/** + * 椤圭洰鍩烘湰淇℃伅Service鎺ュ彛 + * + * @author farben + * @date 2023-09-09 + */ +public interface IBmsProjectInfoService extends IService { + /** + * 鏌ヨ椤圭洰鍩烘湰淇℃伅 + * + * @param id 椤圭洰鍩烘湰淇℃伅涓婚敭 + * @return 椤圭洰鍩烘湰淇℃伅 + */ + public BmsProjectInfo selectBmsProjectInfoById(Long id); + + /** + * 鏌ヨ椤圭洰鍩烘湰淇℃伅鍒楄〃 + * + * @param bmsProjectInfo 椤圭洰鍩烘湰淇℃伅 + * @return 椤圭洰鍩烘湰淇℃伅闆嗗悎 + */ + public List selectBmsProjectInfoList(BmsProjectInfo bmsProjectInfo); + + /** + * 鏂板椤圭洰鍩烘湰淇℃伅 + * + * @param bmsProjectInfo 椤圭洰鍩烘湰淇℃伅 + * @return 缁撴灉 + */ + public int insertBmsProjectInfo(BmsProjectInfo bmsProjectInfo); + + /** + * 淇敼椤圭洰鍩烘湰淇℃伅 + * + * @param bmsProjectInfo 椤圭洰鍩烘湰淇℃伅 + * @return 缁撴灉 + */ + public int updateBmsProjectInfo(BmsProjectInfo bmsProjectInfo); + + /** + * 鎵归噺鍒犻櫎椤圭洰鍩烘湰淇℃伅 + * + * @param ids 闇瑕佸垹闄ょ殑椤圭洰鍩烘湰淇℃伅涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsProjectInfoByIds(Long[] ids); + + /** + * 鍒犻櫎椤圭洰鍩烘湰淇℃伅淇℃伅 + * + * @param id 椤圭洰鍩烘湰淇℃伅涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsProjectInfoById(Long id); + + + public BmsProjectInfo getProjectInfo(Long templateRecordId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsProjectSettlementAwardService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsProjectSettlementAwardService.java new file mode 100644 index 0000000..1ea4af3 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsProjectSettlementAwardService.java @@ -0,0 +1,65 @@ +package com.ruoyi.jjh.declaration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.declaration.entity.BmsProjectSettlementAward; +import com.ruoyi.jjh.declaration.entity.dto.BmsProjectSettlementAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsProjectSettlementAwardUpdateDto; +import com.ruoyi.jjh.declaration.entity.vo.BmsProjectSettlementAwardQueryVo; + +import java.util.List; + +/** + * 椤圭洰钀芥埛濂栬ˉService鎺ュ彛 + * + * @author farben + * @date 2023-08-25 + */ +public interface IBmsProjectSettlementAwardService extends IService { + /** + * 鏌ヨ椤圭洰钀芥埛濂栬ˉ + * + * @param id 椤圭洰钀芥埛濂栬ˉ涓婚敭 + * @return 椤圭洰钀芥埛濂栬ˉ + */ + public BmsProjectSettlementAwardQueryVo selectBmsProjectSettlementAwardById(Long id); + + /** + * 鏌ヨ椤圭洰钀芥埛濂栬ˉ鍒楄〃 + * + * @param bmsProjectSettlementAward 椤圭洰钀芥埛濂栬ˉ + * @return 椤圭洰钀芥埛濂栬ˉ闆嗗悎 + */ + public List selectBmsProjectSettlementAwardList(BmsProjectSettlementAward bmsProjectSettlementAward); + + /** + * 鏂板椤圭洰钀芥埛濂栬ˉ + * + * @param bmsProjectSettlementAwardAddDto 椤圭洰钀芥埛濂栬ˉ + * @return 缁撴灉 + */ + public int insertBmsProjectSettlementAward(BmsProjectSettlementAwardAddDto bmsProjectSettlementAwardAddDto); + + /** + * 淇敼椤圭洰钀芥埛濂栬ˉ + * + * @param bmsProjectSettlementAwardUpdateDto 椤圭洰钀芥埛濂栬ˉ + * @return 缁撴灉 + */ + public int updateBmsProjectSettlementAward(BmsProjectSettlementAwardUpdateDto bmsProjectSettlementAwardUpdateDto); + + /** + * 鎵归噺鍒犻櫎椤圭洰钀芥埛濂栬ˉ + * + * @param ids 闇瑕佸垹闄ょ殑椤圭洰钀芥埛濂栬ˉ涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsProjectSettlementAwardByIds(Long[] ids); + + /** + * 鍒犻櫎椤圭洰钀芥埛濂栬ˉ淇℃伅 + * + * @param id 椤圭洰钀芥埛濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsProjectSettlementAwardById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsSceneOpeningAwardService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsSceneOpeningAwardService.java new file mode 100644 index 0000000..f2448e0 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsSceneOpeningAwardService.java @@ -0,0 +1,64 @@ +package com.ruoyi.jjh.declaration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.declaration.entity.BmsSceneOpeningAward; +import com.ruoyi.jjh.declaration.entity.dto.BmsSceneOpeningAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsSceneOpeningAwardUpdateDto; + +import java.util.List; + +/** + * 鍦烘櫙寮鏀惧琛ervice鎺ュ彛 + * + * @author farben + * @date 2023-08-25 + */ +public interface IBmsSceneOpeningAwardService extends IService { + /** + * 鏌ヨ鍦烘櫙寮鏀惧琛 + * + * @param id 鍦烘櫙寮鏀惧琛ヤ富閿 + * @return 鍦烘櫙寮鏀惧琛 + */ + public BmsSceneOpeningAward selectBmsSceneOpeningAwardById(Long id); + + /** + * 鏌ヨ鍦烘櫙寮鏀惧琛ュ垪琛 + * + * @param bmsSceneOpeningAward 鍦烘櫙寮鏀惧琛 + * @return 鍦烘櫙寮鏀惧琛ラ泦鍚 + */ + public List selectBmsSceneOpeningAwardList(BmsSceneOpeningAward bmsSceneOpeningAward); + + /** + * 鏂板鍦烘櫙寮鏀惧琛 + * + * @param bmsSceneOpeningAwardAddDto 鍦烘櫙寮鏀惧琛 + * @return 缁撴灉 + */ + public int insertBmsSceneOpeningAward(BmsSceneOpeningAwardAddDto bmsSceneOpeningAwardAddDto); + + /** + * 淇敼鍦烘櫙寮鏀惧琛 + * + * @param bmsSceneOpeningAwardUpdateDto 鍦烘櫙寮鏀惧琛 + * @return 缁撴灉 + */ + public int updateBmsSceneOpeningAward(BmsSceneOpeningAwardUpdateDto bmsSceneOpeningAwardUpdateDto); + + /** + * 鎵归噺鍒犻櫎鍦烘櫙寮鏀惧琛 + * + * @param ids 闇瑕佸垹闄ょ殑鍦烘櫙寮鏀惧琛ヤ富閿泦鍚 + * @return 缁撴灉 + */ + public int deleteBmsSceneOpeningAwardByIds(Long[] ids); + + /** + * 鍒犻櫎鍦烘櫙寮鏀惧琛ヤ俊鎭 + * + * @param id 鍦烘櫙寮鏀惧琛ヤ富閿 + * @return 缁撴灉 + */ + public int deleteBmsSceneOpeningAwardById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsTemplateInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsTemplateInfoService.java new file mode 100644 index 0000000..43afa79 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsTemplateInfoService.java @@ -0,0 +1,77 @@ +package com.ruoyi.jjh.declaration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.declaration.entity.BmsTemplateInfo; +import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateInfoQueryVo; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 鐢虫姤妯℃澘淇℃伅Service鎺ュ彛 + * + * @author farben + * @date 2023-08-25 + */ +public interface IBmsTemplateInfoService extends IService { + /** + * 鏌ヨ鐢虫姤妯℃澘淇℃伅 + * + * @param id 鐢虫姤妯℃澘淇℃伅涓婚敭 + * @return 鐢虫姤妯℃澘淇℃伅 + */ + public BmsTemplateInfo selectBmsTemplateInfoById(Long id); + + /** + * 鏌ヨ鐢虫姤妯℃澘淇℃伅鍒楄〃 + * + * @param bmsTemplateInfo 鐢虫姤妯℃澘淇℃伅 + * @return 鐢虫姤妯℃澘淇℃伅闆嗗悎 + */ + public List selectBmsTemplateInfoList(BmsTemplateInfo bmsTemplateInfo); + + /** + * 瀵煎嚭妯℃澘琛ㄥ崟 + * + * @param request + * @param response + * @param id + * @return + * @author emiya.xie + * @create 2023/8/31 10:25 + */ + public void exportTemplate(HttpServletRequest request, HttpServletResponse response, Long id); + + /** + * 鏂板鐢虫姤妯℃澘淇℃伅 + * + * @param bmsTemplateInfo 鐢虫姤妯℃澘淇℃伅 + * @return 缁撴灉 + */ + public int insertBmsTemplateInfo(BmsTemplateInfo bmsTemplateInfo); + + /** + * 淇敼鐢虫姤妯℃澘淇℃伅 + * + * @param bmsTemplateInfo 鐢虫姤妯℃澘淇℃伅 + * @return 缁撴灉 + */ + public int updateBmsTemplateInfo(BmsTemplateInfo bmsTemplateInfo); + + /** + * 鎵归噺鍒犻櫎鐢虫姤妯℃澘淇℃伅 + * + * @param ids 闇瑕佸垹闄ょ殑鐢虫姤妯℃澘淇℃伅涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsTemplateInfoByIds(Long[] ids); + + /** + * 鍒犻櫎鐢虫姤妯℃澘淇℃伅淇℃伅 + * + * @param id 鐢虫姤妯℃澘淇℃伅涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsTemplateInfoById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsTemplateRecordService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsTemplateRecordService.java new file mode 100644 index 0000000..dcca8b0 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsTemplateRecordService.java @@ -0,0 +1,71 @@ +package com.ruoyi.jjh.declaration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord; +import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateQueryDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordQueryDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordUpdateDto; +import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordQueryVo; +import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordVo; + +import java.util.List; + +/** + * 鍦ㄧ嚎妯℃澘Service鎺ュ彛 + * + * @author farben + * @date 2023-09-07 + */ +public interface IBmsTemplateRecordService extends IService { + /** + * 鏌ヨ鍦ㄧ嚎妯℃澘 + * + * @param id 鍦ㄧ嚎妯℃澘涓婚敭 + * @return 鍦ㄧ嚎妯℃澘 + */ + public BmsTemplateRecordVo selectBmsTemplateRecordById(Long id); + + /** + * 鏌ヨ鍦ㄧ嚎妯℃澘鍒楄〃 + * + * @param bmsTemplateRecordQueryDto 鍦ㄧ嚎妯℃澘 + * @return 鍦ㄧ嚎妯℃澘闆嗗悎 + */ + public List selectBmsTemplateRecordList(BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto); + + public List selectTemplateRecordList(String creditCode); + + public List selectBmsTemplateNameList(BmsTemplateQueryDto bmsTemplateQueryDto); + /** + * 鏂板鍦ㄧ嚎妯℃澘 + * + * @param bmsTemplateRecordAddDto 鍦ㄧ嚎妯℃澘 + * @return 缁撴灉 + */ + public int insertBmsTemplateRecord(BmsTemplateRecordAddDto bmsTemplateRecordAddDto); + + /** + * 淇敼鍦ㄧ嚎妯℃澘 + * + * @param bmsTemplateRecordUpdateDto 鍦ㄧ嚎妯℃澘 + * @return 缁撴灉 + */ + public int updateBmsTemplateRecord(BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto); + + /** + * 鎵归噺鍒犻櫎鍦ㄧ嚎妯℃澘 + * + * @param ids 闇瑕佸垹闄ょ殑鍦ㄧ嚎妯℃澘涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBmsTemplateRecordByIds(Long[] ids); + + /** + * 鍒犻櫎鍦ㄧ嚎妯℃澘淇℃伅 + * + * @param id 鍦ㄧ嚎妯℃澘涓婚敭 + * @return 缁撴灉 + */ + public int deleteBmsTemplateRecordById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBsmFundingInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBsmFundingInfoService.java new file mode 100644 index 0000000..7f9fbd0 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBsmFundingInfoService.java @@ -0,0 +1,62 @@ +package com.ruoyi.jjh.declaration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.declaration.entity.BsmFundingInfo; + +import java.util.List; + +/** + * 璧勯噾淇℃伅Service鎺ュ彛 + * + * @author farben + * @date 2023-08-25 + */ +public interface IBsmFundingInfoService extends IService { + /** + * 鏌ヨ璧勯噾淇℃伅 + * + * @param id 璧勯噾淇℃伅涓婚敭 + * @return 璧勯噾淇℃伅 + */ + public BsmFundingInfo selectBsmFundingInfoById(Long id); + + /** + * 鏌ヨ璧勯噾淇℃伅鍒楄〃 + * + * @param bsmFundingInfo 璧勯噾淇℃伅 + * @return 璧勯噾淇℃伅闆嗗悎 + */ + public List selectBsmFundingInfoList(BsmFundingInfo bsmFundingInfo); + + /** + * 鏂板璧勯噾淇℃伅 + * + * @param bsmFundingInfo 璧勯噾淇℃伅 + * @return 缁撴灉 + */ + public int insertBsmFundingInfo(BsmFundingInfo bsmFundingInfo); + + /** + * 淇敼璧勯噾淇℃伅 + * + * @param bsmFundingInfo 璧勯噾淇℃伅 + * @return 缁撴灉 + */ + public int updateBsmFundingInfo(BsmFundingInfo bsmFundingInfo); + + /** + * 鎵归噺鍒犻櫎璧勯噾淇℃伅 + * + * @param ids 闇瑕佸垹闄ょ殑璧勯噾淇℃伅涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteBsmFundingInfoByIds(Long[] ids); + + /** + * 鍒犻櫎璧勯噾淇℃伅淇℃伅 + * + * @param id 璧勯噾淇℃伅涓婚敭 + * @return 缁撴灉 + */ + public int deleteBsmFundingInfoById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/ICommonService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/ICommonService.java new file mode 100644 index 0000000..ed6670e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/ICommonService.java @@ -0,0 +1,40 @@ +package com.ruoyi.jjh.declaration.service; + +import com.ruoyi.jjh.declaration.entity.dto.BmsApprovalInfoUpdateDto; +import com.ruoyi.jjh.declaration.entity.dto.OpenInterfaceApplyAddDto; +import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo; + +import java.util.List; + +/** + *

+ * 鍏叡鏈嶅姟 + *

+ * + * @interfaceName: CommonService + * @author: emiya.xie + * @create: 2023-08-31 15:43 + */ +public interface ICommonService { + + public Long checkEnterprise(String creditCode,int templateRecordId); + + public void checkDeclaration(String creditCode,int templateRecordId); + + public void checkEnterprise(Long enterpriseId,Long templateId); + + public void getData(int templateRecordId, Long detailId, DeclarationRecordsVo declarationRecordsVo); + + public void insertProcessInfo(Long declarationRecordId,Integer approvalType); + + public void insertAuditRecord(Long declarationRecordId,Integer approvalType); + + public void cleanProcessList(Long declarationRecordId); + + public List getUserIds(Long userId); + + public int updateBmsApprovalInfo(BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto); + + public int insertOpenInterfaceApplyAddDto(OpenInterfaceApplyAddDto openInterfaceApplyAddDto); + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IOpenInterfaceService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IOpenInterfaceService.java new file mode 100644 index 0000000..ff4abd9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IOpenInterfaceService.java @@ -0,0 +1,26 @@ +package com.ruoyi.jjh.declaration.service; + +import com.ruoyi.jjh.declaration.entity.BmsProjectInfo; +import com.ruoyi.jjh.declaration.entity.dto.OpenInterfaceApplyAddDto; +import com.ruoyi.jjh.declaration.entity.vo.EnterpriseInfoTemplateVo; + + +/** + *

+ * 寮鏀炬帴鍙 + *

+ * + * @className: IOpenInterfaceService + * @author: emiya.xie + * @create: 2023-09-12 10:13 + */ +public interface IOpenInterfaceService { + + public EnterpriseInfoTemplateVo enterpriseList(String creditCode); + + + public int insertOpenInterfaceApplyAddDto(OpenInterfaceApplyAddDto openInterfaceApplyAddDto); + + public BmsProjectInfo getProjectInfo(Long templateRecordId); + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsApprovalInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsApprovalInfoServiceImpl.java new file mode 100644 index 0000000..95ee5ab --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsApprovalInfoServiceImpl.java @@ -0,0 +1,105 @@ +package com.ruoyi.jjh.declaration.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.jjh.declaration.entity.BmsApprovalInfo; +import com.ruoyi.jjh.declaration.entity.vo.BmsApprovalInfoQueryVo; +import com.ruoyi.jjh.declaration.mapper.BmsApprovalInfoMapper; +import com.ruoyi.jjh.declaration.service.IBmsApprovalInfoService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 瀹℃壒璁板綍淇℃伅Service涓氬姟灞傚鐞 + * + * @author farben + * @date 2023-09-09 + */ +@Service +public class BmsApprovalInfoServiceImpl extends ServiceImpl implements IBmsApprovalInfoService { + + + /** + * 鏌ヨ瀹℃壒璁板綍淇℃伅 + * + * @param id 瀹℃壒璁板綍淇℃伅涓婚敭 + * @return 瀹℃壒璁板綍淇℃伅 + */ + @Override + public BmsApprovalInfo selectBmsApprovalInfoById(Long id) { + return baseMapper.selectBmsApprovalInfoById(id); + } + + /** + * 鏌ヨ瀹℃壒璁板綍淇℃伅鍒楄〃 + * + * @param bmsApprovalInfo 瀹℃壒璁板綍淇℃伅 + * @return 瀹℃壒璁板綍淇℃伅 + */ + @Override + public List selectBmsApprovalInfoList(BmsApprovalInfo bmsApprovalInfo) { + return baseMapper.selectBmsApprovalInfoList(bmsApprovalInfo); + } + + /** + * 鏂板瀹℃壒璁板綍淇℃伅 + * + * @param bmsApprovalInfo 瀹℃壒璁板綍淇℃伅 + * @return 缁撴灉 + */ + @Override + public int insertBmsApprovalInfo(BmsApprovalInfo bmsApprovalInfo) { + bmsApprovalInfo.setCreateTime(DateUtils.getNowDate()); + return baseMapper.insertBmsApprovalInfo(bmsApprovalInfo); + } + + /** + * 淇敼瀹℃壒璁板綍淇℃伅 + * + * @param bmsApprovalInfo 瀹℃壒璁板綍淇℃伅 + * @return 缁撴灉 + */ + @Override + public int updateBmsApprovalInfo(BmsApprovalInfo bmsApprovalInfo) { + bmsApprovalInfo.setUpdateTime(DateUtils.getNowDate()); + return baseMapper.updateBmsApprovalInfo(bmsApprovalInfo); + } + + /** + * 鎵归噺鍒犻櫎瀹℃壒璁板綍淇℃伅 + * + * @param ids 闇瑕佸垹闄ょ殑瀹℃壒璁板綍淇℃伅涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsApprovalInfoByIds(Long[] ids) { + return baseMapper.deleteBmsApprovalInfoByIds(ids); + } + + @Override + public int updateApproval(Long declarationRecordsId) { + return baseMapper.updateApproval(declarationRecordsId); + } + + @Override + public int updateApprovalList(List recordsId) { + return baseMapper.updateApprovalList(recordsId); + } + + /** + * 鍒犻櫎瀹℃壒璁板綍淇℃伅淇℃伅 + * + * @param id 瀹℃壒璁板綍淇℃伅涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsApprovalInfoById(Long id) { + return baseMapper.deleteBmsApprovalInfoById(id); + } + + @Override + public List getApprovalInfoList(Long declarationRecordsId) { + return baseMapper.getApprovalInfoList(declarationRecordsId); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java new file mode 100644 index 0000000..feaa24c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java @@ -0,0 +1,168 @@ +package com.ruoyi.jjh.declaration.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.jjh.declaration.entity.BmsBigStrongAward; +import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; +import com.ruoyi.jjh.declaration.entity.BmsFundingDetail; +import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardUpdateDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsFundingDetailAddDto; +import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo; +import com.ruoyi.jjh.declaration.mapper.BmsBigStrongAwardMapper; +import com.ruoyi.jjh.declaration.service.IBmsBigStrongAwardService; +import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; +import com.ruoyi.jjh.declaration.service.IBmsFundingDetailService; +import com.ruoyi.jjh.declaration.service.ICommonService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +/** + * 鍋氬ぇ鍋氬己濂栬鎯匰ervice涓氬姟灞傚鐞 + * + * @author farben + * @date 2023-08-25 + */ +@Service +@Lazy +public class BmsBigStrongAwardServiceImpl extends ServiceImpl implements IBmsBigStrongAwardService { + + @Autowired + private ICommonService iCommonService; + + @Autowired + private IBmsFundingDetailService iBmsFundingDetailService; + + @Autowired + private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; + + /** + * 鏌ヨ鍋氬ぇ鍋氬己濂栬鎯 + * + * @param id 鍋氬ぇ鍋氬己濂栬鎯呬富閿 + * @return 鍋氬ぇ鍋氬己濂栬鎯 + */ + @Override + public BmsBigStrongAwardQueryVo selectBmsBigStrongAwardById(Long id) { + return baseMapper.selectBmsBigStrongAwardById(id); + } + + /** + * 鏌ヨ鍋氬ぇ鍋氬己濂栬鎯呭垪琛 + * + * @param bmsBigStrongAward 鍋氬ぇ鍋氬己濂栬鎯 + * @return 鍋氬ぇ鍋氬己濂栬鎯 + */ + @Override + public List selectBmsBigStrongAwardList(BmsBigStrongAward bmsBigStrongAward) { + return baseMapper.selectBmsBigStrongAwardList(bmsBigStrongAward); + } + + /** + * 鏂板鍋氬ぇ鍋氬己濂栬鎯 + * + * @param bmsBigStrongAwardAddDto 鍋氬ぇ鍋氬己濂栬鎯 + * @return 缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int insertBmsBigStrongAward(BmsBigStrongAwardAddDto bmsBigStrongAwardAddDto) { + + // check 浼佷笟淇℃伅 + Long enterpriseId = iCommonService.checkEnterprise(bmsBigStrongAwardAddDto.getCreditCode(), bmsBigStrongAwardAddDto.getTemplateRecordId()); + // check 鐢虫姤淇℃伅 + iCommonService.checkDeclaration(bmsBigStrongAwardAddDto.getCreditCode() + , bmsBigStrongAwardAddDto.getTemplateRecordId()); + if (enterpriseId == 0) { + return 0; + } + BmsBigStrongAward bmsBigStrongAward = new BmsBigStrongAward(); + BeanUtil.copyProperties(bmsBigStrongAwardAddDto, bmsBigStrongAward); + bmsBigStrongAward.setEnterpriseId(enterpriseId); + // 鏂板鍋氬ぇ鍋氬己濂栬鎯 + int num = baseMapper.insert(bmsBigStrongAward); + + List fundingDetailList = bmsBigStrongAwardAddDto.getFundingDetailList(); + List fundingInfoList = new ArrayList<>(); + fundingDetailList.forEach(x -> { + BmsFundingDetail fundingInfo = new BmsFundingDetail(); + BeanUtil.copyProperties(x, fundingInfo); + fundingInfo.setType(2); + fundingInfo.setTemplateRecordId(bmsBigStrongAwardAddDto.getTemplateRecordId()); + fundingInfo.setDetailId(bmsBigStrongAward.getId()); + fundingInfoList.add(fundingInfo); + }); + // 鎵归噺鏂板璧勯噾淇℃伅 + iBmsFundingDetailService.saveOrUpdateBatch(fundingInfoList); + // 鏂板鐢宠璁板綍 + BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); + BeanUtil.copyProperties(bmsBigStrongAwardAddDto, declarationRecords); + declarationRecords.setMatter("鎻愪氦鍋氬ぇ鍋氬己濂栬ˉ鐢宠"); + declarationRecords.setDetailId(bmsBigStrongAward.getId()); + declarationRecords.setEnterpriseId(enterpriseId); + iBmsDeclarationRecordsService.save(declarationRecords); + // 鐢宠瀹℃壒 + if (bmsBigStrongAwardAddDto.getStatus() == 1) { + // 瀹℃壒鐘舵 + iCommonService.insertAuditRecord(declarationRecords.getId(), 0); + } + + return num; + } + + + /** + * 淇敼鍋氬ぇ鍋氬己濂栬鎯 + * + * @param bmsBigStrongAwardUpdateDto 鍋氬ぇ鍋氬己濂栬鎯 + * @return 缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int updateBmsBigStrongAward(BmsBigStrongAwardUpdateDto bmsBigStrongAwardUpdateDto) { + int num = 0; + try { + iBmsDeclarationRecordsService.updateDeclarationRecords(bmsBigStrongAwardUpdateDto.getDeclarationRecordsId() + , bmsBigStrongAwardUpdateDto.getProjectId(), bmsBigStrongAwardUpdateDto.getProjectName() + , bmsBigStrongAwardUpdateDto.getStatus()); + num = baseMapper.updateBmsBigStrongAward(bmsBigStrongAwardUpdateDto); + List fundingDetailList = bmsBigStrongAwardUpdateDto.getFundingDetailList(); + iBmsFundingDetailService.saveOrUpdateBatch(fundingDetailList); + // 鐢宠瀹℃壒 + if (bmsBigStrongAwardUpdateDto.getStatus() == 1) { + // 瀹℃壒鐘舵 + iCommonService.insertAuditRecord(bmsBigStrongAwardUpdateDto.getDeclarationRecordsId(), 0); + } + } catch (Exception e) { + e.printStackTrace(); + } + return num; + } + + /** + * 鎵归噺鍒犻櫎鍋氬ぇ鍋氬己濂栬鎯 + * + * @param ids 闇瑕佸垹闄ょ殑鍋氬ぇ鍋氬己濂栬鎯呬富閿 + * @return 缁撴灉 + */ + @Override + public int deleteBmsBigStrongAwardByIds(Long[] ids) { + return baseMapper.deleteBmsBigStrongAwardByIds(ids); + } + + /** + * 鍒犻櫎鍋氬ぇ鍋氬己濂栬鎯呬俊鎭 + * + * @param id 鍋氬ぇ鍋氬己濂栬鎯呬富閿 + * @return 缁撴灉 + */ + @Override + public int deleteBmsBigStrongAwardById(Long id) { + return baseMapper.deleteBmsBigStrongAwardById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBrandingAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBrandingAwardServiceImpl.java new file mode 100644 index 0000000..f353db1 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBrandingAwardServiceImpl.java @@ -0,0 +1,140 @@ +package com.ruoyi.jjh.declaration.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.jjh.declaration.entity.BmsBrandingAward; +import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; +import com.ruoyi.jjh.declaration.entity.dto.BmsBrandingAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsBrandingAwardUpdateDto; +import com.ruoyi.jjh.declaration.mapper.BmsBrandingAwardMapper; +import com.ruoyi.jjh.declaration.service.IBmsBrandingAwardService; +import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; +import com.ruoyi.jjh.declaration.service.ICommonService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 鍝佺墝鎵撻犲琛ervice涓氬姟灞傚鐞 + * + * @author farben + * @date 2023-08-25 + */ +@Service +public class BmsBrandingAwardServiceImpl extends ServiceImpl implements IBmsBrandingAwardService { + + @Autowired + private ICommonService iCommonService; + + @Autowired + private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; + /** + * 鏌ヨ鍝佺墝鎵撻犲琛 + * + * @param id 鍝佺墝鎵撻犲琛ヤ富閿 + * @return 鍝佺墝鎵撻犲琛 + */ + @Override + public BmsBrandingAward selectBmsBrandingAwardById(Long id) { + return baseMapper.selectBmsBrandingAwardById(id); + } + + /** + * 鏌ヨ鍝佺墝鎵撻犲琛ュ垪琛 + * + * @param bmsBrandingAward 鍝佺墝鎵撻犲琛 + * @return 鍝佺墝鎵撻犲琛 + */ + @Override + public List selectBmsBrandingAwardList(BmsBrandingAward bmsBrandingAward) { + return baseMapper.selectBmsBrandingAwardList(bmsBrandingAward); + } + + /** + * 鏂板鍝佺墝鎵撻犲琛 + * + * @param bmsBrandingAwardAddDto 鍝佺墝鎵撻犲琛 + * @return 缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int insertBmsBrandingAward(BmsBrandingAwardAddDto bmsBrandingAwardAddDto) { + Long enterpriseId = iCommonService.checkEnterprise(bmsBrandingAwardAddDto.getCreditCode() + ,bmsBrandingAwardAddDto.getTemplateRecordId()); + // check 鐢虫姤淇℃伅 + iCommonService.checkDeclaration(bmsBrandingAwardAddDto.getCreditCode() + ,bmsBrandingAwardAddDto.getTemplateRecordId()); + BmsBrandingAward bmsBrandingAward = new BmsBrandingAward(); + BeanUtil.copyProperties(bmsBrandingAwardAddDto,bmsBrandingAward); + bmsBrandingAward.setEnterpriseId(enterpriseId); + // 鏂板鍋氬ぇ鍋氬己濂栬鎯 + int num = baseMapper.insert(bmsBrandingAward); + + // 鏂板鐢宠璁板綍 + BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); + BeanUtil.copyProperties(bmsBrandingAwardAddDto,declarationRecords); + declarationRecords.setMatter("鎻愪氦鍝佺墝鎵撻犲琛ョ敵璇"); + declarationRecords.setEnterpriseId(enterpriseId); + declarationRecords.setDetailId(bmsBrandingAward.getId()); + iBmsDeclarationRecordsService.save(declarationRecords); + // 鐢熸垚瀹℃牳 + if (bmsBrandingAwardAddDto.getStatus()==1){ + // 瀹℃壒鐘舵 + iCommonService.insertAuditRecord(declarationRecords.getId(),0); + } + return num; + } + + /** + * 淇敼鍝佺墝鎵撻犲琛 + * + * @param bmsBrandingAwardUpdateDto 鍝佺墝鎵撻犲琛 + * @return 缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int updateBmsBrandingAward(BmsBrandingAwardUpdateDto bmsBrandingAwardUpdateDto) { + int num = 0; + try { + iBmsDeclarationRecordsService.updateDeclarationRecords(bmsBrandingAwardUpdateDto.getDeclarationRecordsId() + ,bmsBrandingAwardUpdateDto.getProjectId(),bmsBrandingAwardUpdateDto.getProjectName() + ,bmsBrandingAwardUpdateDto.getStatus()); + + bmsBrandingAwardUpdateDto.setUpdateTime(DateUtils.getNowDate()); + num = baseMapper.updateBmsBrandingAward(bmsBrandingAwardUpdateDto); + // 鐢宠瀹℃壒 + if (bmsBrandingAwardUpdateDto.getStatus()==1){ + // 瀹℃壒鐘舵 + iCommonService.insertAuditRecord(bmsBrandingAwardUpdateDto.getDeclarationRecordsId(),0); + } + }catch (Exception e){ + e.printStackTrace(); + } + return num; + } + + /** + * 鎵归噺鍒犻櫎鍝佺墝鎵撻犲琛 + * + * @param ids 闇瑕佸垹闄ょ殑鍝佺墝鎵撻犲琛ヤ富閿 + * @return 缁撴灉 + */ + @Override + public int deleteBmsBrandingAwardByIds(Long[] ids) { + return baseMapper.deleteBmsBrandingAwardByIds(ids); + } + + /** + * 鍒犻櫎鍝佺墝鎵撻犲琛ヤ俊鎭 + * + * @param id 鍝佺墝鎵撻犲琛ヤ富閿 + * @return 缁撴灉 + */ + @Override + public int deleteBmsBrandingAwardById(Long id) { + return baseMapper.deleteBmsBrandingAwardById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCarrierConstructionAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCarrierConstructionAwardServiceImpl.java new file mode 100644 index 0000000..984cf66 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCarrierConstructionAwardServiceImpl.java @@ -0,0 +1,140 @@ +package com.ruoyi.jjh.declaration.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.jjh.declaration.entity.BmsCarrierConstructionAward; +import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; +import com.ruoyi.jjh.declaration.entity.dto.BmsCarrierConstructionAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsCarrierConstructionAwardUpdateDto; +import com.ruoyi.jjh.declaration.mapper.BmsCarrierConstructionAwardMapper; +import com.ruoyi.jjh.declaration.service.IBmsCarrierConstructionAwardService; +import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; +import com.ruoyi.jjh.declaration.service.ICommonService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 杞戒綋寤鸿濂栬ˉService涓氬姟灞傚鐞 + * + * @author farben + * @date 2023-08-25 + */ +@Service +public class BmsCarrierConstructionAwardServiceImpl extends ServiceImpl implements IBmsCarrierConstructionAwardService { + + @Autowired + private ICommonService iCommonService; + + @Autowired + private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; + /** + * 鏌ヨ杞戒綋寤鸿濂栬ˉ + * + * @param id 杞戒綋寤鸿濂栬ˉ涓婚敭 + * @return 杞戒綋寤鸿濂栬ˉ + */ + @Override + public BmsCarrierConstructionAward selectBmsCarrierConstructionAwardById(Long id) { + return baseMapper.selectBmsCarrierConstructionAwardById(id); + } + + /** + * 鏌ヨ杞戒綋寤鸿濂栬ˉ鍒楄〃 + * + * @param bmsCarrierConstructionAward 杞戒綋寤鸿濂栬ˉ + * @return 杞戒綋寤鸿濂栬ˉ + */ + @Override + public List selectBmsCarrierConstructionAwardList(BmsCarrierConstructionAward bmsCarrierConstructionAward) { + return baseMapper.selectBmsCarrierConstructionAwardList(bmsCarrierConstructionAward); + } + + /** + * 鏂板杞戒綋寤鸿濂栬ˉ + * + * @param bmsCarrierConstructionAwardAddDto 杞戒綋寤鸿濂栬ˉ + * @return 缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int insertBmsCarrierConstructionAward(BmsCarrierConstructionAwardAddDto bmsCarrierConstructionAwardAddDto) { + + Long enterpriseId = iCommonService.checkEnterprise(bmsCarrierConstructionAwardAddDto.getCreditCode() + ,bmsCarrierConstructionAwardAddDto.getTemplateRecordId()); + // check 鐢虫姤淇℃伅 + iCommonService.checkDeclaration(bmsCarrierConstructionAwardAddDto.getCreditCode() + ,bmsCarrierConstructionAwardAddDto.getTemplateRecordId()); + BmsCarrierConstructionAward bmsCarrierConstructionAward = new BmsCarrierConstructionAward(); + BeanUtil.copyProperties(bmsCarrierConstructionAwardAddDto,bmsCarrierConstructionAward); + bmsCarrierConstructionAward.setEnterpriseId(enterpriseId); + // 鏂板鍋氬ぇ鍋氬己濂栬鎯 + int num = baseMapper.insert(bmsCarrierConstructionAward); + + // 鏂板鐢宠璁板綍 + BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); + BeanUtil.copyProperties(bmsCarrierConstructionAwardAddDto,declarationRecords); + declarationRecords.setMatter("鎻愪氦杞戒綋寤鸿濂栬ˉ鐢宠"); + declarationRecords.setEnterpriseId(enterpriseId); + declarationRecords.setDetailId(bmsCarrierConstructionAward.getId()); + iBmsDeclarationRecordsService.save(declarationRecords); + // 鐢熸垚瀹℃牳 + if (bmsCarrierConstructionAwardAddDto.getStatus()==1){ + // 瀹℃壒鐘舵 + iCommonService.insertAuditRecord(declarationRecords.getId(),0); + } + return num; + } + + /** + * 淇敼杞戒綋寤鸿濂栬ˉ + * + * @param bmsCarrierConstructionAwardUpdateDto 杞戒綋寤鸿濂栬ˉ + * @return 缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int updateBmsCarrierConstructionAward(BmsCarrierConstructionAwardUpdateDto bmsCarrierConstructionAwardUpdateDto) { + int num = 0; + try { + iBmsDeclarationRecordsService.updateDeclarationRecords(bmsCarrierConstructionAwardUpdateDto.getDeclarationRecordsId() + ,bmsCarrierConstructionAwardUpdateDto.getProjectId(),bmsCarrierConstructionAwardUpdateDto.getProjectName() + ,bmsCarrierConstructionAwardUpdateDto.getStatus()); + bmsCarrierConstructionAwardUpdateDto.setUpdateTime(DateUtils.getNowDate()); + num = baseMapper.updateBmsCarrierConstructionAward(bmsCarrierConstructionAwardUpdateDto); + // 鐢宠瀹℃壒 + if (bmsCarrierConstructionAwardUpdateDto.getStatus()==1){ + // 瀹℃壒鐘舵 + iCommonService.insertAuditRecord(bmsCarrierConstructionAwardUpdateDto.getDeclarationRecordsId(),0); + } + }catch (Exception e){ + e.printStackTrace(); + } + return num; + } + + /** + * 鎵归噺鍒犻櫎杞戒綋寤鸿濂栬ˉ + * + * @param ids 闇瑕佸垹闄ょ殑杞戒綋寤鸿濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsCarrierConstructionAwardByIds(Long[] ids) { + return baseMapper.deleteBmsCarrierConstructionAwardByIds(ids); + } + + /** + * 鍒犻櫎杞戒綋寤鸿濂栬ˉ淇℃伅 + * + * @param id 杞戒綋寤鸿濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsCarrierConstructionAwardById(Long id) { + return baseMapper.deleteBmsCarrierConstructionAwardById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCreditManagementServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCreditManagementServiceImpl.java new file mode 100644 index 0000000..5a1f990 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCreditManagementServiceImpl.java @@ -0,0 +1,141 @@ +package com.ruoyi.jjh.declaration.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.jjh.declaration.entity.BmsCreditManagement; +import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; +import com.ruoyi.jjh.declaration.entity.dto.BmsCreditManagementAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsCreditManagementUpdateDto; +import com.ruoyi.jjh.declaration.mapper.BmsCreditManagementMapper; +import com.ruoyi.jjh.declaration.service.IBmsCreditManagementService; +import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; +import com.ruoyi.jjh.declaration.service.ICommonService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 淇$敤绠$悊濂栬ˉService涓氬姟灞傚鐞 + * + * @author farben + * @date 2023-09-04 + */ +@Service +public class BmsCreditManagementServiceImpl extends ServiceImpl implements IBmsCreditManagementService { + + @Autowired + private ICommonService iCommonService; + + @Autowired + private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; + + /** + * 鏌ヨ淇$敤绠$悊濂栬ˉ + * + * @param id 淇$敤绠$悊濂栬ˉ涓婚敭 + * @return 淇$敤绠$悊濂栬ˉ + */ + @Override + public BmsCreditManagement selectBmsCreditManagementById(Long id) { + return baseMapper.selectBmsCreditManagementById(id); + } + + /** + * 鏌ヨ淇$敤绠$悊濂栬ˉ鍒楄〃 + * + * @param bmsCreditManagement 淇$敤绠$悊濂栬ˉ + * @return 淇$敤绠$悊濂栬ˉ + */ + @Override + public List selectBmsCreditManagementList(BmsCreditManagement bmsCreditManagement) { + return baseMapper.selectBmsCreditManagementList(bmsCreditManagement); + } + + /** + * 鏂板淇$敤绠$悊濂栬ˉ + * + * @param bmsCreditManagementAddDto 淇$敤绠$悊濂栬ˉ + * @return 缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int insertBmsCreditManagement(BmsCreditManagementAddDto bmsCreditManagementAddDto) { + Long enterpriseId = iCommonService.checkEnterprise(bmsCreditManagementAddDto.getCreditCode() + ,bmsCreditManagementAddDto.getTemplateRecordId()); + // check 鐢虫姤淇℃伅 + iCommonService.checkDeclaration(bmsCreditManagementAddDto.getCreditCode() + ,bmsCreditManagementAddDto.getTemplateRecordId()); + BmsCreditManagement bmsCreditManagement = new BmsCreditManagement(); + BeanUtil.copyProperties(bmsCreditManagementAddDto,bmsCreditManagement); + bmsCreditManagement.setEnterpriseId(enterpriseId); + // 鏂板鍋氬ぇ鍋氬己濂栬鎯 + int num = baseMapper.insert(bmsCreditManagement); + + // 鏂板鐢宠璁板綍 + BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); + BeanUtil.copyProperties(bmsCreditManagementAddDto,declarationRecords); + declarationRecords.setMatter("鎻愪氦淇$敤绠$悊濂栬ˉ鐢宠"); + declarationRecords.setEnterpriseId(enterpriseId); + declarationRecords.setDetailId(bmsCreditManagement.getId()); + iBmsDeclarationRecordsService.save(declarationRecords); + // 鐢熸垚瀹℃牳 + if (bmsCreditManagementAddDto.getStatus()==1){ + // 瀹℃壒鐘舵 + iCommonService.insertAuditRecord(declarationRecords.getId(),0); + } + return num; + } + + /** + * 淇敼淇$敤绠$悊濂栬ˉ + * + * @param bmsCreditManagementUpdateDto 淇$敤绠$悊濂栬ˉ + * @return 缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int updateBmsCreditManagement(BmsCreditManagementUpdateDto bmsCreditManagementUpdateDto) { + int num = 0; + try { + iBmsDeclarationRecordsService.updateDeclarationRecords(bmsCreditManagementUpdateDto.getDeclarationRecordsId() + ,bmsCreditManagementUpdateDto.getProjectId(),bmsCreditManagementUpdateDto.getProjectName() + ,bmsCreditManagementUpdateDto.getStatus()); + + bmsCreditManagementUpdateDto.setUpdateTime(DateUtils.getNowDate()); + num = baseMapper.updateBmsCreditManagement(bmsCreditManagementUpdateDto); + // 鐢宠瀹℃壒 + if (bmsCreditManagementUpdateDto.getStatus()==1){ + // 瀹℃壒鐘舵 + iCommonService.insertAuditRecord(bmsCreditManagementUpdateDto.getDeclarationRecordsId(),0); + } + }catch (Exception e){ + e.printStackTrace(); + } + return num; + } + + /** + * 鎵归噺鍒犻櫎淇$敤绠$悊濂栬ˉ + * + * @param ids 闇瑕佸垹闄ょ殑淇$敤绠$悊濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsCreditManagementByIds(Long[] ids) { + return baseMapper.deleteBmsCreditManagementByIds(ids); + } + + /** + * 鍒犻櫎淇$敤绠$悊濂栬ˉ淇℃伅 + * + * @param id 淇$敤绠$悊濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsCreditManagementById(Long id) { + return baseMapper.deleteBmsCreditManagementById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsDeclarationRecordsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsDeclarationRecordsServiceImpl.java new file mode 100644 index 0000000..b6f401b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsDeclarationRecordsServiceImpl.java @@ -0,0 +1,555 @@ +package com.ruoyi.jjh.declaration.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.context.SecurityContextHolder; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.jjh.declaration.entity.BmsApprovalInfo; +import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; +import com.ruoyi.jjh.declaration.entity.BmsFieldInfo; +import com.ruoyi.jjh.declaration.entity.BmsFileInfo; +import com.ruoyi.jjh.declaration.entity.BmsProcessInfo; +import com.ruoyi.jjh.declaration.entity.dto.ApprovalDeclarationRecordsQueryDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsApprovalInfoUpdateDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsDeclarationRecordsAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsDeclarationRecordsDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsFieldInfoAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsFileInfoAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsMunicipalBureauReviewQueryDto; +import com.ruoyi.jjh.declaration.entity.dto.MunicipalReviewDto; +import com.ruoyi.jjh.declaration.entity.dto.MunicipalReviewInfoDto; +import com.ruoyi.jjh.declaration.entity.vo.ApprovalDeclarationRecordsQueryVo; +import com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo; +import com.ruoyi.jjh.declaration.entity.vo.BmsMunicipalBureauReviewQueryVo; +import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo; +import com.ruoyi.jjh.declaration.mapper.BmsDeclarationRecordsMapper; +import com.ruoyi.jjh.declaration.service.IBmsApprovalInfoService; +import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; +import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService; +import com.ruoyi.jjh.declaration.service.IBmsFieldInfoService; +import com.ruoyi.jjh.declaration.service.IBmsFileInfoService; +import com.ruoyi.jjh.declaration.service.IBmsProcessInfoService; +import com.ruoyi.jjh.declaration.service.ICommonService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * 鍦ㄧ嚎鐢虫姤璁板綍Service涓氬姟灞傚鐞 + * + * @author farben + * @date 2023-08-28 + */ +@Service +public class BmsDeclarationRecordsServiceImpl extends ServiceImpl implements IBmsDeclarationRecordsService { + + @Autowired + private ICommonService iCommonService; + + @Autowired + private IBmsFieldInfoService iBmsFieldInfoService; + + @Autowired + private IBmsFileInfoService iBmsFileInfoService; + + @Autowired + private IBmsApprovalInfoService iBmsApprovalInfoService; + + @Autowired + private IBmsProcessInfoService iBmsProcessInfoService; + + @Autowired + private IBmsEnterpriseBasicInfoService iBmsEnterpriseBasicInfoService; + + + /** + * 鏌ヨ鍦ㄧ嚎鐢虫姤璁板綍 + * + * @param id 鍦ㄧ嚎鐢虫姤璁板綍涓婚敭 + * @return 鍦ㄧ嚎鐢虫姤璁板綍 + */ + @Override + public DeclarationRecordsVo selectBmsDeclarationRecordsById(Long id) { + // 鑾峰彇鐢宠璁板綍 + BmsDeclarationRecords declarationRecords = baseMapper.selectBmsDeclarationRecordsById(id); + DeclarationRecordsVo declarationRecordsVo = new DeclarationRecordsVo(); + declarationRecordsVo.setBmsDeclarationRecords(declarationRecords); + // 鍦ㄧ嚎妯℃澘璁板綍id + int declarationTemplateType = declarationRecords.getDeclarationTemplateType(); + // 璇︽儏id + Long detailId = declarationRecords.getDetailId(); + // 浼佷笟id + Long enterpriseId = declarationRecords.getEnterpriseId(); + // 鑾峰彇璇︽儏鏁版嵁 + iCommonService.getData(declarationTemplateType, detailId, declarationRecordsVo); + //浼佷笟鍩烘湰淇℃伅 + declarationRecordsVo.setBmsEnterpriseBasicInfo(iBmsEnterpriseBasicInfoService.selectBmsEnterpriseBasicInfoById(enterpriseId)); + + declarationRecordsVo.setApprovalInfoList(iBmsApprovalInfoService.getApprovalInfoList(id)); + + return declarationRecordsVo; + } + + + /** + * 鏌ヨ鍦ㄧ嚎鐢虫姤璁板綍鍒楄〃 + * + * @param bmsDeclarationRecordsDto 鍦ㄧ嚎鐢虫姤璁板綍 + * @return 鍦ㄧ嚎鐢虫姤璁板綍 + */ + @Override + public List selectBmsDeclarationRecordsList(BmsDeclarationRecordsDto bmsDeclarationRecordsDto) { + return baseMapper.selectBmsDeclarationRecordsList(bmsDeclarationRecordsDto); + } + + @Override + public List selectBmsDeclarationRecordsZwList(BmsDeclarationRecordsDto bmsDeclarationRecordsDto) { + return baseMapper.selectBmsDeclarationRecordsZwList(bmsDeclarationRecordsDto); + } + + @Override + public List selectMunicipalBureauReviewList() { + return baseMapper.selectMunicipalBureauReviewList(); + } + + /** + * 瀹℃牳鍒楄〃 + * + * @param approvalDeclarationRecordsQueryDto + * @return {@link List< ApprovalDeclarationRecordsQueryVo>} + * @author emiya.xie + * @create 2023/9/9 15:14 + */ + @Override + public List approvalList(ApprovalDeclarationRecordsQueryDto approvalDeclarationRecordsQueryDto) { +// approvalDeclarationRecordsQueryDto.setUserIds(iCommonService.getUserIds(SecurityContextHolder.getUserId())); + approvalDeclarationRecordsQueryDto.setApprovalById(SecurityContextHolder.getUserId()); + return baseMapper.approvalList(approvalDeclarationRecordsQueryDto); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int updateBmsApprovalInfo(BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto) { + Boolean flag = false; + List approvalInfoList = iBmsApprovalInfoService.lambdaQuery().eq(BmsApprovalInfo::getDeclarationRecordsId, bmsApprovalInfoUpdateDto.getDeclarationRecordsId()).orderByAsc(BmsApprovalInfo::getSort).list(); + AtomicReference processId = new AtomicReference<>(0L); + if (CollectionUtil.isNotEmpty(approvalInfoList)) { + approvalInfoList.forEach(x -> { + if (x.getIsReview().equals(0)) { + bmsApprovalInfoUpdateDto.setId(x.getId()); + bmsApprovalInfoUpdateDto.setSort(x.getSort()); + BeanUtil.copyProperties(bmsApprovalInfoUpdateDto, x); + x.setApprovalById(SecurityContextHolder.getUserId()); + x.setApprovalTime(DateUtils.getNowDate()); + processId.set(x.getProcessId()); + } + }); + approvalInfoList.forEach(x -> { + if ((bmsApprovalInfoUpdateDto.getSort() + 1) == x.getSort()) { + x.setIsReview(0); + } + }); + flag = iBmsApprovalInfoService.saveOrUpdateBatch(approvalInfoList); + approval(bmsApprovalInfoUpdateDto, processId.get()); + } + if (!flag) { + return 0; + } + return 1; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int updateApprovalInfo(BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto) { + // 鏂板瀹℃牳璁板綍锛屼慨鏀圭敵鎶ヨ褰曠姸鎬 + List bmsProcessInfoList = iBmsProcessInfoService.lambdaQuery().eq(BmsProcessInfo::getApprovalType, 0).list(); + BmsProcessInfo bmsProcessInfo = new BmsProcessInfo(); + bmsProcessInfoList.forEach(x -> { + boolean flag = Arrays.asList(x.getApprovalByIds().split(",")).contains(String.valueOf(SecurityContextHolder.getUserId())); + if (flag) { + BeanUtil.copyProperties(x, bmsProcessInfo); + } + }); + // 瀹℃壒璁板綍 + List approvalInfoList = iBmsApprovalInfoService.lambdaQuery().eq(BmsApprovalInfo::getDeclarationRecordsId, bmsApprovalInfoUpdateDto.getDeclarationRecordsId()).orderByDesc(BmsApprovalInfo::getSort).list(); + // 鏇存柊瀹℃壒璁板綍 + if (CollectionUtil.isNotEmpty(approvalInfoList)) { + approvalInfoList.forEach(x -> { + if (bmsProcessInfo.getId().equals(x.getProcessId()) && x.getApprovalStatus().equals(0)) { + // 鏇存柊瀹℃壒璁板綍 + Integer sort = x.getSort(); + bmsApprovalInfoUpdateDto.setId(x.getId()); +// bmsApprovalInfoUpdateDto.setSort(x.getSort()); + BeanUtil.copyProperties(bmsApprovalInfoUpdateDto, x); + x.setSort(sort); + x.setApprovalById(SecurityContextHolder.getUserId()); + x.setApprovalTime(DateUtils.getNowDate()); + x.setIsReview(2); + iBmsApprovalInfoService.saveOrUpdate(x); + } + }); + } + + // 鏂板璁板綍 + if (bmsApprovalInfoUpdateDto.getApprovalStatus().equals(1)) { + BmsProcessInfo bmsProcessInfo2 = new BmsProcessInfo(); + bmsProcessInfoList.forEach(x -> { + if (x.getId().equals(bmsProcessInfo.getNextProcessId())) { + BeanUtil.copyProperties(x, bmsProcessInfo2); + } + }); + if (BeanUtil.isNotEmpty(bmsProcessInfo2)) { + BmsApprovalInfo bmsApprovalInfo = new BmsApprovalInfo(); + bmsApprovalInfo.setProcessId(bmsProcessInfo2.getId()); + bmsApprovalInfo.setDeclarationRecordsId(bmsApprovalInfoUpdateDto.getDeclarationRecordsId()); + bmsApprovalInfo.setApprovalById(bmsProcessInfo2.getApprovalById()); + bmsApprovalInfo.setApprovalStatus(0); + bmsApprovalInfo.setSort(approvalInfoList.size() + 1); + iBmsApprovalInfoService.saveOrUpdate(bmsApprovalInfo); + } + } + // 鏇存柊璁板綍鐘舵 + int num = approval(bmsApprovalInfoUpdateDto, bmsProcessInfo); + + return num; + } + + public int approval(BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto, BmsProcessInfo bmsProcessInfo) { + + BmsDeclarationRecords bmsDeclarationRecords = baseMapper.selectById(bmsApprovalInfoUpdateDto.getDeclarationRecordsId()); + if (bmsProcessInfo.getApprovalLevel().equals(0)) { + if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) { + bmsDeclarationRecords.setStatus(2L); + } else { + bmsDeclarationRecords.setStatus(8L); + } + } else if (bmsProcessInfo.getApprovalLevel().equals(1)) { + if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) { + bmsDeclarationRecords.setStatus(3L); + } else { + bmsDeclarationRecords.setStatus(7L); + } + } else if (bmsProcessInfo.getApprovalLevel().equals(2)) { + if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) { + bmsDeclarationRecords.setStatus(4L); + } else { + bmsDeclarationRecords.setStatus(6L); + } + } else if (bmsProcessInfo.getApprovalLevel().equals(3)) { + if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) { + bmsDeclarationRecords.setStatus(5L); + } else { + bmsDeclarationRecords.setStatus(9L); + } + } + return baseMapper.updateById(bmsDeclarationRecords); + } + + /** + * 瀹℃壒 + * + * @param bmsApprovalInfoUpdateDto + * @param processId + * @return + * @author emiya.xie + * @create 2023/9/9 18:22 + */ + public void approval(BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto, Long processId) { + BmsProcessInfo bmsProcessInfo = iBmsProcessInfoService.lambdaQuery().eq(BmsProcessInfo::getId, processId).list().get(0); + if (BeanUtil.isNotEmpty(bmsProcessInfo)) { + BmsDeclarationRecords bmsDeclarationRecords = baseMapper.selectById(bmsApprovalInfoUpdateDto.getDeclarationRecordsId()); + if (bmsProcessInfo.getApprovalLevel().equals(0)) { + if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) { + bmsDeclarationRecords.setStatus(2L); + } else { + bmsDeclarationRecords.setStatus(8L); + } + } else if (bmsProcessInfo.getApprovalLevel().equals(1)) { + if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) { + bmsDeclarationRecords.setStatus(3L); + } else { + bmsDeclarationRecords.setStatus(7L); + } + } else if (bmsProcessInfo.getApprovalLevel().equals(2)) { + if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) { + bmsDeclarationRecords.setStatus(4L); + } else { + bmsDeclarationRecords.setStatus(6L); + } + } else if (bmsProcessInfo.getApprovalLevel().equals(3)) { + if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) { + bmsDeclarationRecords.setStatus(5L); + } else { + bmsDeclarationRecords.setStatus(9L); + } + } + baseMapper.updateById(bmsDeclarationRecords); + } + } + + /** + * 鏂板鍦ㄧ嚎鐢虫姤璁板綍 + * + * @param bmsDeclarationRecordsAddDto 鍦ㄧ嚎鐢虫姤璁板綍 + * @return 缁撴灉 + */ + @Override + public int insertBmsDeclarationRecords(BmsDeclarationRecordsAddDto bmsDeclarationRecordsAddDto) { + iCommonService.checkEnterprise(bmsDeclarationRecordsAddDto.getEnterpriseId(), bmsDeclarationRecordsAddDto.getTemplateId()); + BmsDeclarationRecords bmsDeclarationRecords = new BmsDeclarationRecords(); + BeanUtil.copyProperties(bmsDeclarationRecordsAddDto, bmsDeclarationRecords); + bmsDeclarationRecords.setMatter(""); + // 鏂板鍦ㄧ嚎鐢宠璁板綍 + int num = baseMapper.insert(bmsDeclarationRecords); + // 鎵归噺淇濆瓨瀛楁淇℃伅 + List fieldList = bmsDeclarationRecordsAddDto.getFieldList(); + List fieldInfoList = new ArrayList<>(); + if (null != fieldList && fieldList.size() > 0) { + fieldList.forEach(x -> { + BmsFieldInfo bmsFieldInfo = new BmsFieldInfo(); + BeanUtil.copyProperties(x, bmsFieldInfo); + bmsFieldInfo.setDetailId(bmsDeclarationRecords.getId()); + fieldInfoList.add(bmsFieldInfo); + }); + iBmsFieldInfoService.saveOrUpdateBatch(fieldInfoList); + } + // 鎵归噺淇濆瓨鏂囦欢淇℃伅 + List fileList = bmsDeclarationRecordsAddDto.getFileList(); + List fileInfoList = new ArrayList<>(); + if (null != fileList && fileList.size() > 0) { + fileList.forEach(x -> { + BmsFileInfo bmsFileInfo = new BmsFileInfo(); + BeanUtil.copyProperties(x, bmsFileInfo); + bmsFileInfo.setDetailId(bmsDeclarationRecords.getId()); + fileInfoList.add(bmsFileInfo); + }); + iBmsFileInfoService.saveOrUpdateBatch(fileInfoList); + } + return num; + } + + /** + * 淇敼鍦ㄧ嚎鐢虫姤璁板綍 + * + * @param bmsDeclarationRecords 鍦ㄧ嚎鐢虫姤璁板綍 + * @return 缁撴灉 + */ + @Override + public int updateBmsDeclarationRecords(BmsDeclarationRecords bmsDeclarationRecords) { + bmsDeclarationRecords.setUpdateTime(DateUtils.getNowDate()); + return baseMapper.updateBmsDeclarationRecords(bmsDeclarationRecords); + } + + /** + * 甯傜骇璇勫畾缁撴灉纭 + * + * @param municipalReviewDto + * @return {@link int} + * @author emiya.xie + * @create 2023/9/13 17:21 + */ + @Override + public int municipalReview(MunicipalReviewDto municipalReviewDto) { + List list = municipalReviewDto.getList(); + // 闇瑕佹洿鏂扮殑鏁版嵁 + List reviewrecordsList = new ArrayList<>(); + // 缁熶竴淇$敤浠g爜銆佸勾浠姐佺敵鎶ョ被鍨 -- > 鐢虫姤璁板綍 --> + // 鏌ヨ浼佷笟鏁版嵁 + List enterpriseInfoList = iBmsEnterpriseBasicInfoService.lambdaQuery().list(); + Map enterpriseBasicMap = enterpriseInfoList.stream().collect(Collectors.toMap(BmsEnterpriseBasicInfo::getCreditCode, Function.identity())); + + // 鍖归厤浼佷笟 + List enterpriseIdList = new ArrayList<>(); + list.forEach(x -> { + if (enterpriseBasicMap.containsKey(x.getCreditCode())) { + x.setEnterpriseId(enterpriseBasicMap.get(x.getCreditCode()).getId()); + // 鑾峰彇瀵瑰簲浼佷笟id闆嗗悎 + enterpriseIdList.add(enterpriseBasicMap.get(x.getCreditCode()).getId()); + } + // 鍖哄垎鐘舵 + if (x.getResult().equals("閫氳繃")) { + x.setStatus(5L); + } else { + x.setStatus(9L); + } + }); + + //鑾峰彇瀵瑰簲浼佷笟鐨勭敵鎶ヨ褰 + List recordsList = baseMapper.selectList(Wrappers.lambdaQuery(BmsDeclarationRecords.class).in(BmsDeclarationRecords::getEnterpriseId, enterpriseIdList).eq(BmsDeclarationRecords::getStatus, 4)); + if (CollectionUtil.isNotEmpty(recordsList)) { + // 鏍规嵁鏉′欢瀵规瘮鑾峰彇璁板綍id + + // 璁板綍id闆嗗悎 + List declarationIdList = new ArrayList<>(); + for (BmsDeclarationRecords records : recordsList) { + for (MunicipalReviewInfoDto dto : list) { + if (records.getEnterpriseId().equals(dto.getEnterpriseId()) && records.getYear().equals(dto.getYear()) && records.getProjectName().contains(dto.getDeclarationTypeStr())) { + records.setStatus(dto.getStatus()); + dto.setDeclarationId(records.getId()); + declarationIdList.add(records.getId()); + reviewrecordsList.add(records); + } + } + } + + if (CollectionUtil.isNotEmpty(reviewrecordsList)) { + Map reviewInfoMap = list.stream().collect(Collectors.toMap(MunicipalReviewInfoDto::getDeclarationId, Function.identity())); + + // 鏌ヨ瀹℃壒璁板綍骞舵洿鏂 + List approvalInfoList = iBmsApprovalInfoService.lambdaQuery().in(BmsApprovalInfo::getDeclarationRecordsId, declarationIdList).eq(BmsApprovalInfo::getProcessId, 4).eq(BmsApprovalInfo::getApprovalStatus, 0).list(); + // 闇瑕佹洿鏂扮殑瀹℃壒鏁版嵁鐨刬d + List recordsIdList = new ArrayList<>(); + approvalInfoList.forEach(x -> { + if (reviewInfoMap.containsKey(x.getDeclarationRecordsId())) { + MunicipalReviewInfoDto reviewInfoDto = reviewInfoMap.get(x.getDeclarationRecordsId()); + if (reviewInfoDto.getStatus() == 5) { + x.setApprovalStatus(1); + } else { + recordsIdList.add(x.getDeclarationRecordsId()); + x.setApprovalStatus(2); + x.setIsBeforeData(1); + } + x.setApprovalOpinions(reviewInfoDto.getResult()); + x.setApprovalById(SecurityContextHolder.getUserId()); + x.setApprovalTime(DateUtils.getNowDate()); + } + }); + if (CollectionUtil.isNotEmpty(recordsIdList)) { + iBmsApprovalInfoService.updateApprovalList(recordsIdList); + } + // 鎵归噺淇濆瓨璁板綍 + boolean b = this.saveOrUpdateBatch(reviewrecordsList); + // 瀹℃煡瀹℃壒璁板綍 + iBmsApprovalInfoService.saveOrUpdateBatch(approvalInfoList); + } + } + + return reviewrecordsList.size(); + } + + /** + * 甯傚眬瀹℃壒 + * + * @param municipalReviewDto + * @return {@link int} + * @author emiya.xie + * @create 2023/9/17 13:59 + */ + @Override + public int municipalReviewNew(MunicipalReviewDto municipalReviewDto) { + List reviewList = municipalReviewDto.getReviewList(); + // 闇瑕佹洿鏂扮殑鐢虫姤璁板綍 + List recordsUpdate = new ArrayList<>(); + if (CollectionUtil.isNotEmpty(reviewList)) { + //TODO + // 1銆佹牴鎹鍏ョ殑鐢虫姤璁板綍id鑾峰彇瀵瑰簲鏁版嵁 + // 2銆佷慨鏀圭敵鎶ヨ褰曠姸鎬侊紝 + // 3銆佹洿鏂扮敵鎶ヨ褰曞搴旂殑瀹℃牳璁板綍锛堝鏋滄槸鎷掔粷锛岃繕瑕佷慨鏀瑰鏍歌褰曠殑isBeforeData鏁版嵁鐘舵侊級 + List ids = reviewList.stream().map(BmsMunicipalBureauReviewQueryDto::getId).collect(Collectors.toList()); + // 鏌ヨ鍒扮殑鐢虫姤璁板綍 + List records = baseMapper.selectList(Wrappers.lambdaQuery(BmsDeclarationRecords.class).in(BmsDeclarationRecords::getId, ids).eq(BmsDeclarationRecords::getStatus, 4)); + // key 锛氳褰昳d,褰㈡垚map + Map recordsMap = records.stream().collect(Collectors.toMap(BmsDeclarationRecords::getId, Function.identity())); + // 鏌ヨ瀹℃壒璁板綍骞舵洿鏂 + List approvalInfoList = iBmsApprovalInfoService.lambdaQuery().in(BmsApprovalInfo::getDeclarationRecordsId, ids).eq(BmsApprovalInfo::getProcessId, 4).eq(BmsApprovalInfo::getApprovalStatus, 0).list(); + Map approvalMap = approvalInfoList.stream().collect(Collectors.toMap(BmsApprovalInfo::getDeclarationRecordsId, Function.identity())); + + // 闇瑕佹洿鏂扮殑瀹℃壒璁板綍 + List approvalInfoUpdate = new ArrayList<>(); + // 闇瑕佹洿鏂扮殑瀹℃壒鏁版嵁鐨刬d + List recordsIdList = new ArrayList<>(); + reviewList.forEach(x -> { + if (recordsMap.containsKey(x.getId())) { + BmsDeclarationRecords bmsDeclarationRecords = recordsMap.get(x.getId()); + if (x.getResult() == 0) { + bmsDeclarationRecords.setStatus(5L); + } else { + bmsDeclarationRecords.setStatus(9L); + } + recordsUpdate.add(bmsDeclarationRecords); + } + if (approvalMap.containsKey(x.getId())) { + BmsApprovalInfo bmsApprovalInfo = approvalMap.get(x.getId()); + if (x.getResult() == 0) { + bmsApprovalInfo.setApprovalStatus(1); + } else { + bmsApprovalInfo.setApprovalStatus(2); + recordsIdList.add(x.getId()); + } + bmsApprovalInfo.setApprovalOpinions(x.getOpinion()); + bmsApprovalInfo.setApprovalTime(DateUtils.getNowDate()); + approvalInfoUpdate.add(bmsApprovalInfo); + } + }); + + if (CollectionUtil.isNotEmpty(recordsIdList)) { + iBmsApprovalInfoService.updateApprovalList(recordsIdList); + } + // 鎵归噺淇濆瓨璁板綍 + this.saveOrUpdateBatch(recordsUpdate); + // 瀹℃煡瀹℃壒璁板綍 + iBmsApprovalInfoService.saveOrUpdateBatch(approvalInfoUpdate); + } + return recordsUpdate.size(); + } + + /** + * 鎵归噺鍒犻櫎鍦ㄧ嚎鐢虫姤璁板綍 + * + * @param ids 闇瑕佸垹闄ょ殑鍦ㄧ嚎鐢虫姤璁板綍涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsDeclarationRecordsByIds(Long[] ids) { + return baseMapper.deleteBmsDeclarationRecordsByIds(ids); + } + + /** + * 鍒犻櫎鍦ㄧ嚎鐢虫姤璁板綍淇℃伅 + * + * @param id 鍦ㄧ嚎鐢虫姤璁板綍涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsDeclarationRecordsById(Long id) { + return baseMapper.deleteBmsDeclarationRecordsById(id); + } + + /** + * 鏇存柊椤圭洰鍚嶇Оby Id + * + * @param id + * @param projectName + * @return {@link int} + * @author emiya.xie + * @create 2023/9/6 15:13 + */ + @Override + public int updateProjectNameById(Long id, String projectName, Long projectId) { + return baseMapper.updateProjectNameById(id, projectName, projectId); + } + + @Override + public int updateDeclarationRecords(Long declarationId, Long projectId, String projectName, Long status) { + BmsDeclarationRecords bmsDeclarationRecords = baseMapper.selectById(declarationId); + if (bmsDeclarationRecords.getStatus() == 6 || bmsDeclarationRecords.getStatus() == 7 || bmsDeclarationRecords.getStatus() == 8) { + // 琚嫆缁濓紝灏嗗師瀹℃壒璁板綍淇敼涓烘嫆缁濆墠鏁版嵁 + iBmsApprovalInfoService.updateApproval(declarationId); + } + bmsDeclarationRecords.setProjectId(projectId); + bmsDeclarationRecords.setProjectName(projectName); + bmsDeclarationRecords.setStatus(status); + return baseMapper.updateById(bmsDeclarationRecords); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsEnterpriseBasicInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsEnterpriseBasicInfoServiceImpl.java new file mode 100644 index 0000000..c37aa02 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsEnterpriseBasicInfoServiceImpl.java @@ -0,0 +1,88 @@ +package com.ruoyi.jjh.declaration.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; +import com.ruoyi.jjh.declaration.mapper.BmsEnterpriseBasicInfoMapper; +import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 浼佷笟鍩虹淇℃伅Service涓氬姟灞傚鐞 + * + * @author farben + * @date 2023-08-25 + */ +@Service +public class BmsEnterpriseBasicInfoServiceImpl extends ServiceImpl implements IBmsEnterpriseBasicInfoService { + + /** + * 鏌ヨ浼佷笟鍩虹淇℃伅 + * + * @param id 浼佷笟鍩虹淇℃伅涓婚敭 + * @return 浼佷笟鍩虹淇℃伅 + */ + @Override + public BmsEnterpriseBasicInfo selectBmsEnterpriseBasicInfoById(Long id) { + return baseMapper.selectBmsEnterpriseBasicInfoById(id); + } + + /** + * 鏌ヨ浼佷笟鍩虹淇℃伅鍒楄〃 + * + * @param bmsEnterpriseBasicInfo 浼佷笟鍩虹淇℃伅 + * @return 浼佷笟鍩虹淇℃伅 + */ + @Override + public List selectBmsEnterpriseBasicInfoList(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) { + return baseMapper.selectBmsEnterpriseBasicInfoList(bmsEnterpriseBasicInfo); + } + + /** + * 鏂板浼佷笟鍩虹淇℃伅 + * + * @param bmsEnterpriseBasicInfo 浼佷笟鍩虹淇℃伅 + * @return 缁撴灉 + */ + @Override + public int insertBmsEnterpriseBasicInfo(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) { + bmsEnterpriseBasicInfo.setCreateTime(DateUtils.getNowDate()); + return baseMapper.insertBmsEnterpriseBasicInfo(bmsEnterpriseBasicInfo); + } + + /** + * 淇敼浼佷笟鍩虹淇℃伅 + * + * @param bmsEnterpriseBasicInfo 浼佷笟鍩虹淇℃伅 + * @return 缁撴灉 + */ + @Override + public int updateBmsEnterpriseBasicInfo(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) { + bmsEnterpriseBasicInfo.setUpdateTime(DateUtils.getNowDate()); + return baseMapper.updateBmsEnterpriseBasicInfo(bmsEnterpriseBasicInfo); + } + + /** + * 鎵归噺鍒犻櫎浼佷笟鍩虹淇℃伅 + * + * @param ids 闇瑕佸垹闄ょ殑浼佷笟鍩虹淇℃伅涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsEnterpriseBasicInfoByIds(Long[] ids) { + return baseMapper.deleteBmsEnterpriseBasicInfoByIds(ids); + } + + /** + * 鍒犻櫎浼佷笟鍩虹淇℃伅淇℃伅 + * + * @param id 浼佷笟鍩虹淇℃伅涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsEnterpriseBasicInfoById(Long id) { + return baseMapper.deleteBmsEnterpriseBasicInfoById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsEnterpriseDirectoryServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsEnterpriseDirectoryServiceImpl.java new file mode 100644 index 0000000..ea57213 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsEnterpriseDirectoryServiceImpl.java @@ -0,0 +1,88 @@ +package com.ruoyi.jjh.declaration.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory; +import com.ruoyi.jjh.declaration.mapper.BmsEnterpriseDirectoryMapper; +import com.ruoyi.jjh.declaration.service.IBmsEnterpriseDirectoryService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 浼佷笟鍚嶅綍Service涓氬姟灞傚鐞 + * + * @author farben + * @date 2023-08-31 + */ +@Service +public class BmsEnterpriseDirectoryServiceImpl extends ServiceImpl implements IBmsEnterpriseDirectoryService { + + /** + * 鏌ヨ浼佷笟鍚嶅綍 + * + * @param id 浼佷笟鍚嶅綍涓婚敭 + * @return 浼佷笟鍚嶅綍 + */ + @Override + public BmsEnterpriseDirectory selectBmsEnterpriseDirectoryById(Long id) { + return baseMapper.selectBmsEnterpriseDirectoryById(id); + } + + /** + * 鏌ヨ浼佷笟鍚嶅綍鍒楄〃 + * + * @param bmsEnterpriseDirectory 浼佷笟鍚嶅綍 + * @return 浼佷笟鍚嶅綍 + */ + @Override + public List selectBmsEnterpriseDirectoryList(BmsEnterpriseDirectory bmsEnterpriseDirectory) { + return baseMapper.selectBmsEnterpriseDirectoryList(bmsEnterpriseDirectory); + } + + /** + * 鏂板浼佷笟鍚嶅綍 + * + * @param bmsEnterpriseDirectory 浼佷笟鍚嶅綍 + * @return 缁撴灉 + */ + @Override + public int insertBmsEnterpriseDirectory(BmsEnterpriseDirectory bmsEnterpriseDirectory) { + bmsEnterpriseDirectory.setCreateTime(DateUtils.getNowDate()); + return baseMapper.insertBmsEnterpriseDirectory(bmsEnterpriseDirectory); + } + + /** + * 淇敼浼佷笟鍚嶅綍 + * + * @param bmsEnterpriseDirectory 浼佷笟鍚嶅綍 + * @return 缁撴灉 + */ + @Override + public int updateBmsEnterpriseDirectory(BmsEnterpriseDirectory bmsEnterpriseDirectory) { + bmsEnterpriseDirectory.setUpdateTime(DateUtils.getNowDate()); + return baseMapper.updateBmsEnterpriseDirectory(bmsEnterpriseDirectory); + } + + /** + * 鎵归噺鍒犻櫎浼佷笟鍚嶅綍 + * + * @param ids 闇瑕佸垹闄ょ殑浼佷笟鍚嶅綍涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsEnterpriseDirectoryByIds(Long[] ids) { + return baseMapper.deleteBmsEnterpriseDirectoryByIds(ids); + } + + /** + * 鍒犻櫎浼佷笟鍚嶅綍淇℃伅 + * + * @param id 浼佷笟鍚嶅綍涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsEnterpriseDirectoryById(Long id) { + return baseMapper.deleteBmsEnterpriseDirectoryById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsFieldInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsFieldInfoServiceImpl.java new file mode 100644 index 0000000..79eb811 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsFieldInfoServiceImpl.java @@ -0,0 +1,89 @@ +package com.ruoyi.jjh.declaration.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.jjh.declaration.entity.BmsFieldInfo; +import com.ruoyi.jjh.declaration.mapper.BmsFieldInfoMapper; +import com.ruoyi.jjh.declaration.service.IBmsFieldInfoService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 妯℃澘瀛楁濉啓璇︽儏Service涓氬姟灞傚鐞 + * + * @author farben + * @date 2023-09-04 + */ +@Service +public class BmsFieldInfoServiceImpl extends ServiceImpl implements IBmsFieldInfoService { + + + /** + * 鏌ヨ妯℃澘瀛楁濉啓璇︽儏 + * + * @param id 妯℃澘瀛楁濉啓璇︽儏涓婚敭 + * @return 妯℃澘瀛楁濉啓璇︽儏 + */ + @Override + public BmsFieldInfo selectBmsFieldInfoById(Long id) { + return baseMapper.selectBmsFieldInfoById(id); + } + + /** + * 鏌ヨ妯℃澘瀛楁濉啓璇︽儏鍒楄〃 + * + * @param bmsFieldInfo 妯℃澘瀛楁濉啓璇︽儏 + * @return 妯℃澘瀛楁濉啓璇︽儏 + */ + @Override + public List selectBmsFieldInfoList(BmsFieldInfo bmsFieldInfo) { + return baseMapper.selectBmsFieldInfoList(bmsFieldInfo); + } + + /** + * 鏂板妯℃澘瀛楁濉啓璇︽儏 + * + * @param bmsFieldInfo 妯℃澘瀛楁濉啓璇︽儏 + * @return 缁撴灉 + */ + @Override + public int insertBmsFieldInfo(BmsFieldInfo bmsFieldInfo) { + bmsFieldInfo.setCreateTime(DateUtils.getNowDate()); + return baseMapper.insertBmsFieldInfo(bmsFieldInfo); + } + + /** + * 淇敼妯℃澘瀛楁濉啓璇︽儏 + * + * @param bmsFieldInfo 妯℃澘瀛楁濉啓璇︽儏 + * @return 缁撴灉 + */ + @Override + public int updateBmsFieldInfo(BmsFieldInfo bmsFieldInfo) { + bmsFieldInfo.setUpdateTime(DateUtils.getNowDate()); + return baseMapper.updateBmsFieldInfo(bmsFieldInfo); + } + + /** + * 鎵归噺鍒犻櫎妯℃澘瀛楁濉啓璇︽儏 + * + * @param ids 闇瑕佸垹闄ょ殑妯℃澘瀛楁濉啓璇︽儏涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsFieldInfoByIds(Long[] ids) { + return baseMapper.deleteBmsFieldInfoByIds(ids); + } + + /** + * 鍒犻櫎妯℃澘瀛楁濉啓璇︽儏淇℃伅 + * + * @param id 妯℃澘瀛楁濉啓璇︽儏涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsFieldInfoById(Long id) { + return baseMapper.deleteBmsFieldInfoById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsFileInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsFileInfoServiceImpl.java new file mode 100644 index 0000000..1dc753c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsFileInfoServiceImpl.java @@ -0,0 +1,89 @@ +package com.ruoyi.jjh.declaration.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.jjh.declaration.entity.BmsFileInfo; +import com.ruoyi.jjh.declaration.mapper.BmsFileInfoMapper; +import com.ruoyi.jjh.declaration.service.IBmsFileInfoService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 鏂囦欢瀛樺偍璇存槑璇︽儏Service涓氬姟灞傚鐞 + * + * @author farben + * @date 2023-09-04 + */ +@Service +public class BmsFileInfoServiceImpl extends ServiceImpl implements IBmsFileInfoService { + + + /** + * 鏌ヨ鏂囦欢瀛樺偍璇存槑璇︽儏 + * + * @param id 鏂囦欢瀛樺偍璇存槑璇︽儏涓婚敭 + * @return 鏂囦欢瀛樺偍璇存槑璇︽儏 + */ + @Override + public BmsFileInfo selectBmsFileInfoById(Long id) { + return baseMapper.selectBmsFileInfoById(id); + } + + /** + * 鏌ヨ鏂囦欢瀛樺偍璇存槑璇︽儏鍒楄〃 + * + * @param bmsFileInfo 鏂囦欢瀛樺偍璇存槑璇︽儏 + * @return 鏂囦欢瀛樺偍璇存槑璇︽儏 + */ + @Override + public List selectBmsFileInfoList(BmsFileInfo bmsFileInfo) { + return baseMapper.selectBmsFileInfoList(bmsFileInfo); + } + + /** + * 鏂板鏂囦欢瀛樺偍璇存槑璇︽儏 + * + * @param bmsFileInfo 鏂囦欢瀛樺偍璇存槑璇︽儏 + * @return 缁撴灉 + */ + @Override + public int insertBmsFileInfo(BmsFileInfo bmsFileInfo) { + bmsFileInfo.setCreateTime(DateUtils.getNowDate()); + return baseMapper.insertBmsFileInfo(bmsFileInfo); + } + + /** + * 淇敼鏂囦欢瀛樺偍璇存槑璇︽儏 + * + * @param bmsFileInfo 鏂囦欢瀛樺偍璇存槑璇︽儏 + * @return 缁撴灉 + */ + @Override + public int updateBmsFileInfo(BmsFileInfo bmsFileInfo) { + bmsFileInfo.setUpdateTime(DateUtils.getNowDate()); + return baseMapper.updateBmsFileInfo(bmsFileInfo); + } + + /** + * 鎵归噺鍒犻櫎鏂囦欢瀛樺偍璇存槑璇︽儏 + * + * @param ids 闇瑕佸垹闄ょ殑鏂囦欢瀛樺偍璇存槑璇︽儏涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsFileInfoByIds(Long[] ids) { + return baseMapper.deleteBmsFileInfoByIds(ids); + } + + /** + * 鍒犻櫎鏂囦欢瀛樺偍璇存槑璇︽儏淇℃伅 + * + * @param id 鏂囦欢瀛樺偍璇存槑璇︽儏涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsFileInfoById(Long id) { + return baseMapper.deleteBmsFileInfoById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsFundingDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsFundingDetailServiceImpl.java new file mode 100644 index 0000000..98b6e6e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsFundingDetailServiceImpl.java @@ -0,0 +1,89 @@ +package com.ruoyi.jjh.declaration.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.jjh.declaration.entity.BmsFundingDetail; +import com.ruoyi.jjh.declaration.mapper.BmsFundingDetailMapper; +import com.ruoyi.jjh.declaration.service.IBmsFundingDetailService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 璧勯噾淇℃伅璇︽儏Service涓氬姟灞傚鐞 + * + * @author farben + * @date 2023-09-04 + */ +@Service +public class BmsFundingDetailServiceImpl extends ServiceImpl implements IBmsFundingDetailService { + + + /** + * 鏌ヨ璧勯噾淇℃伅璇︽儏 + * + * @param id 璧勯噾淇℃伅璇︽儏涓婚敭 + * @return 璧勯噾淇℃伅璇︽儏 + */ + @Override + public BmsFundingDetail selectBmsFundingDetailById(Long id) { + return baseMapper.selectBmsFundingDetailById(id); + } + + /** + * 鏌ヨ璧勯噾淇℃伅璇︽儏鍒楄〃 + * + * @param bmsFundingDetail 璧勯噾淇℃伅璇︽儏 + * @return 璧勯噾淇℃伅璇︽儏 + */ + @Override + public List selectBmsFundingDetailList(BmsFundingDetail bmsFundingDetail) { + return baseMapper.selectBmsFundingDetailList(bmsFundingDetail); + } + + /** + * 鏂板璧勯噾淇℃伅璇︽儏 + * + * @param bmsFundingDetail 璧勯噾淇℃伅璇︽儏 + * @return 缁撴灉 + */ + @Override + public int insertBmsFundingDetail(BmsFundingDetail bmsFundingDetail) { + bmsFundingDetail.setCreateTime(DateUtils.getNowDate()); + return baseMapper.insertBmsFundingDetail(bmsFundingDetail); + } + + /** + * 淇敼璧勯噾淇℃伅璇︽儏 + * + * @param bmsFundingDetail 璧勯噾淇℃伅璇︽儏 + * @return 缁撴灉 + */ + @Override + public int updateBmsFundingDetail(BmsFundingDetail bmsFundingDetail) { + bmsFundingDetail.setUpdateTime(DateUtils.getNowDate()); + return baseMapper.updateBmsFundingDetail(bmsFundingDetail); + } + + /** + * 鎵归噺鍒犻櫎璧勯噾淇℃伅璇︽儏 + * + * @param ids 闇瑕佸垹闄ょ殑璧勯噾淇℃伅璇︽儏涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsFundingDetailByIds(Long[] ids) { + return baseMapper.deleteBmsFundingDetailByIds(ids); + } + + /** + * 鍒犻櫎璧勯噾淇℃伅璇︽儏淇℃伅 + * + * @param id 璧勯噾淇℃伅璇︽儏涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsFundingDetailById(Long id) { + return baseMapper.deleteBmsFundingDetailById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIndustrialInternetAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIndustrialInternetAwardServiceImpl.java new file mode 100644 index 0000000..c97f516 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIndustrialInternetAwardServiceImpl.java @@ -0,0 +1,141 @@ +package com.ruoyi.jjh.declaration.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; +import com.ruoyi.jjh.declaration.entity.BmsIndustrialInternetAward; +import com.ruoyi.jjh.declaration.entity.dto.BmsIndustrialInternetAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsIndustrialInternetAwardUpdateDto; +import com.ruoyi.jjh.declaration.mapper.BmsIndustrialInternetAwardMapper; +import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; +import com.ruoyi.jjh.declaration.service.IBmsIndustrialInternetAwardService; +import com.ruoyi.jjh.declaration.service.ICommonService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 5G+宸ヤ笟浜掕仈缃戝琛ervice涓氬姟灞傚鐞 + * + * @author farben + * @date 2023-08-25 + */ +@Service +public class BmsIndustrialInternetAwardServiceImpl extends ServiceImpl implements IBmsIndustrialInternetAwardService { + + @Autowired + private ICommonService iCommonService; + + @Autowired + private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; + + /** + * 鏌ヨ5G+宸ヤ笟浜掕仈缃戝琛 + * + * @param id 5G+宸ヤ笟浜掕仈缃戝琛ヤ富閿 + * @return 5G+宸ヤ笟浜掕仈缃戝琛 + */ + @Override + public BmsIndustrialInternetAward selectBmsIndustrialInternetAwardById(Long id) { + return baseMapper.selectBmsIndustrialInternetAwardById(id); + } + + /** + * 鏌ヨ5G+宸ヤ笟浜掕仈缃戝琛ュ垪琛 + * + * @param bmsIndustrialInternetAward 5G+宸ヤ笟浜掕仈缃戝琛 + * @return 5G+宸ヤ笟浜掕仈缃戝琛 + */ + @Override + public List selectBmsIndustrialInternetAwardList(BmsIndustrialInternetAward bmsIndustrialInternetAward) { + return baseMapper.selectBmsIndustrialInternetAwardList(bmsIndustrialInternetAward); + } + + /** + * 鏂板5G+宸ヤ笟浜掕仈缃戝琛 + * + * @param bmsIndustrialInternetAwardAddDto 5G+宸ヤ笟浜掕仈缃戝琛 + * @return 缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int insertBmsIndustrialInternetAward(BmsIndustrialInternetAwardAddDto bmsIndustrialInternetAwardAddDto) { + Long enterpriseId = iCommonService.checkEnterprise(bmsIndustrialInternetAwardAddDto.getCreditCode() + ,bmsIndustrialInternetAwardAddDto.getTemplateRecordId()); + // check 鐢虫姤淇℃伅 + iCommonService.checkDeclaration(bmsIndustrialInternetAwardAddDto.getCreditCode() + ,bmsIndustrialInternetAwardAddDto.getTemplateRecordId()); + BmsIndustrialInternetAward bmsIndustrialInternetAward = new BmsIndustrialInternetAward(); + BeanUtil.copyProperties(bmsIndustrialInternetAwardAddDto,bmsIndustrialInternetAward); + bmsIndustrialInternetAward.setEnterpriseId(enterpriseId); + // 鏂板鍋氬ぇ鍋氬己濂栬鎯 + int num = baseMapper.insert(bmsIndustrialInternetAward); + + // 鏂板鐢宠璁板綍 + BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); + BeanUtil.copyProperties(bmsIndustrialInternetAwardAddDto,declarationRecords); + declarationRecords.setMatter("鎻愪氦5G+宸ヤ笟浜掕仈缃戝琛ョ敵璇"); + declarationRecords.setEnterpriseId(enterpriseId); + declarationRecords.setDetailId(bmsIndustrialInternetAward.getId()); + iBmsDeclarationRecordsService.save(declarationRecords); + // 鐢熸垚瀹℃牳 + if (bmsIndustrialInternetAwardAddDto.getStatus()==1){ + // 瀹℃壒鐘舵 + iCommonService.insertAuditRecord(declarationRecords.getId(),0); + } + return num; + } + + /** + * 淇敼5G+宸ヤ笟浜掕仈缃戝琛 + * + * @param bmsIndustrialInternetAwardUpdateDto 5G+宸ヤ笟浜掕仈缃戝琛 + * @return 缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int updateBmsIndustrialInternetAward(BmsIndustrialInternetAwardUpdateDto bmsIndustrialInternetAwardUpdateDto) { + int num = 0; + try { + iBmsDeclarationRecordsService.updateDeclarationRecords(bmsIndustrialInternetAwardUpdateDto.getDeclarationRecordsId() + ,bmsIndustrialInternetAwardUpdateDto.getProjectId(),bmsIndustrialInternetAwardUpdateDto.getProjectName() + ,bmsIndustrialInternetAwardUpdateDto.getStatus()); + + bmsIndustrialInternetAwardUpdateDto.setUpdateTime(DateUtils.getNowDate()); + num = baseMapper.updateBmsIndustrialInternetAward(bmsIndustrialInternetAwardUpdateDto); + // 鐢宠瀹℃壒 + if (bmsIndustrialInternetAwardUpdateDto.getStatus()==1){ + // 瀹℃壒鐘舵 + iCommonService.insertAuditRecord(bmsIndustrialInternetAwardUpdateDto.getDeclarationRecordsId(),0); + } + }catch (Exception e){ + e.printStackTrace(); + } + return num; + } + + /** + * 鎵归噺鍒犻櫎5G+宸ヤ笟浜掕仈缃戝琛 + * + * @param ids 闇瑕佸垹闄ょ殑5G+宸ヤ笟浜掕仈缃戝琛ヤ富閿 + * @return 缁撴灉 + */ + @Override + public int deleteBmsIndustrialInternetAwardByIds(Long[] ids) { + return baseMapper.deleteBmsIndustrialInternetAwardByIds(ids); + } + + /** + * 鍒犻櫎5G+宸ヤ笟浜掕仈缃戝琛ヤ俊鎭 + * + * @param id 5G+宸ヤ笟浜掕仈缃戝琛ヤ富閿 + * @return 缁撴灉 + */ + @Override + public int deleteBmsIndustrialInternetAwardById(Long id) { + return baseMapper.deleteBmsIndustrialInternetAwardById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIntegrationIndustriesServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIntegrationIndustriesServiceImpl.java new file mode 100644 index 0000000..3c3c92e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIntegrationIndustriesServiceImpl.java @@ -0,0 +1,142 @@ +package com.ruoyi.jjh.declaration.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; +import com.ruoyi.jjh.declaration.entity.BmsIntegrationIndustries; +import com.ruoyi.jjh.declaration.entity.dto.BmsIntegrationIndustriesAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsIntegrationIndustriesUpdateDto; +import com.ruoyi.jjh.declaration.mapper.BmsIntegrationIndustriesMapper; +import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; +import com.ruoyi.jjh.declaration.service.IBmsIntegrationIndustriesService; +import com.ruoyi.jjh.declaration.service.ICommonService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 涓や笟铻嶅悎濂栬ˉService涓氬姟灞傚鐞 + * + * @author farben + * @date 2023-09-04 + */ +@Service +public class BmsIntegrationIndustriesServiceImpl extends ServiceImpl implements IBmsIntegrationIndustriesService { + + @Autowired + private ICommonService iCommonService; + + @Autowired + private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; + + /** + * 鏌ヨ涓や笟铻嶅悎濂栬ˉ + * + * @param id 涓や笟铻嶅悎濂栬ˉ涓婚敭 + * @return 涓や笟铻嶅悎濂栬ˉ + */ + @Override + public BmsIntegrationIndustries selectBmsIntegrationIndustriesById(Long id) { + return baseMapper.selectBmsIntegrationIndustriesById(id); + } + + /** + * 鏌ヨ涓や笟铻嶅悎濂栬ˉ鍒楄〃 + * + * @param bmsIntegrationIndustries 涓や笟铻嶅悎濂栬ˉ + * @return 涓や笟铻嶅悎濂栬ˉ + */ + @Override + public List selectBmsIntegrationIndustriesList(BmsIntegrationIndustries bmsIntegrationIndustries) { + return baseMapper.selectBmsIntegrationIndustriesList(bmsIntegrationIndustries); + } + + /** + * 鏂板涓や笟铻嶅悎濂栬ˉ + * + * @param bmsIntegrationIndustriesAddDto 涓や笟铻嶅悎濂栬ˉ + * @return 缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int insertBmsIntegrationIndustries(BmsIntegrationIndustriesAddDto bmsIntegrationIndustriesAddDto) { + Long enterpriseId = iCommonService.checkEnterprise(bmsIntegrationIndustriesAddDto.getCreditCode() + ,bmsIntegrationIndustriesAddDto.getTemplateRecordId()); + // check 鐢虫姤淇℃伅 + iCommonService.checkDeclaration(bmsIntegrationIndustriesAddDto.getCreditCode() + ,bmsIntegrationIndustriesAddDto.getTemplateRecordId()); + BmsIntegrationIndustries bmsIntegrationIndustries = new BmsIntegrationIndustries(); + BeanUtil.copyProperties(bmsIntegrationIndustriesAddDto,bmsIntegrationIndustries); + bmsIntegrationIndustries.setEnterpriseId(enterpriseId); + // 鏂板鍋氬ぇ鍋氬己濂栬鎯 + int num = baseMapper.insert(bmsIntegrationIndustries); + + // 鏂板鐢宠璁板綍 + BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); + BeanUtil.copyProperties(bmsIntegrationIndustriesAddDto,declarationRecords); + declarationRecords.setMatter("鎻愪氦涓や笟铻嶅悎濂栬ˉ鐢宠"); + declarationRecords.setEnterpriseId(enterpriseId); + declarationRecords.setDetailId(bmsIntegrationIndustries.getId()); + iBmsDeclarationRecordsService.save(declarationRecords); + // 鐢熸垚瀹℃牳 + if (bmsIntegrationIndustriesAddDto.getStatus()==1){ + // 瀹℃壒鐘舵 + iCommonService.insertAuditRecord(declarationRecords.getId(),0); + } + return num; + } + + /** + * 淇敼涓や笟铻嶅悎濂栬ˉ + * + * @param bmsIntegrationIndustriesUpdateDto 涓や笟铻嶅悎濂栬ˉ + * @return 缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int updateBmsIntegrationIndustries(BmsIntegrationIndustriesUpdateDto bmsIntegrationIndustriesUpdateDto) { + int num = 0; + try { + iBmsDeclarationRecordsService.updateDeclarationRecords(bmsIntegrationIndustriesUpdateDto.getDeclarationRecordsId() + ,bmsIntegrationIndustriesUpdateDto.getProjectId(),bmsIntegrationIndustriesUpdateDto.getProjectName() + ,bmsIntegrationIndustriesUpdateDto.getStatus()); + + bmsIntegrationIndustriesUpdateDto.setUpdateTime(DateUtils.getNowDate()); + num = baseMapper.updateBmsIntegrationIndustries(bmsIntegrationIndustriesUpdateDto); + // 鐢宠瀹℃壒 + if (bmsIntegrationIndustriesUpdateDto.getStatus()==1){ + // 瀹℃壒鐘舵 + iCommonService.insertAuditRecord(bmsIntegrationIndustriesUpdateDto.getDeclarationRecordsId(),0); + } + }catch (Exception e){ + e.printStackTrace(); + } + bmsIntegrationIndustriesUpdateDto.setUpdateTime(DateUtils.getNowDate()); + return num; + } + + /** + * 鎵归噺鍒犻櫎涓や笟铻嶅悎濂栬ˉ + * + * @param ids 闇瑕佸垹闄ょ殑涓や笟铻嶅悎濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsIntegrationIndustriesByIds(Long[] ids) { + return baseMapper.deleteBmsIntegrationIndustriesByIds(ids); + } + + /** + * 鍒犻櫎涓や笟铻嶅悎濂栬ˉ淇℃伅 + * + * @param id 涓や笟铻嶅悎濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsIntegrationIndustriesById(Long id) { + return baseMapper.deleteBmsIntegrationIndustriesById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsLogisticsDevelopmentAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsLogisticsDevelopmentAwardServiceImpl.java new file mode 100644 index 0000000..7feca83 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsLogisticsDevelopmentAwardServiceImpl.java @@ -0,0 +1,143 @@ +package com.ruoyi.jjh.declaration.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; +import com.ruoyi.jjh.declaration.entity.BmsLogisticsDevelopmentAward; +import com.ruoyi.jjh.declaration.entity.dto.BmsLogisticsDevelopmentAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsLogisticsDevelopmentAwardUpdateDto; +import com.ruoyi.jjh.declaration.mapper.BmsLogisticsDevelopmentAwardMapper; +import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; +import com.ruoyi.jjh.declaration.service.IBmsLogisticsDevelopmentAwardService; +import com.ruoyi.jjh.declaration.service.ICommonService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 鐗╂祦鍙戝睍濂栬ˉService涓氬姟灞傚鐞 + * + * @author farben + * @date 2023-08-25 + */ +@Service +public class BmsLogisticsDevelopmentAwardServiceImpl extends ServiceImpl implements IBmsLogisticsDevelopmentAwardService { + + @Autowired + private ICommonService iCommonService; + + @Autowired + private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; + /** + * 鏌ヨ鐗╂祦鍙戝睍濂栬ˉ + * + * @param id 鐗╂祦鍙戝睍濂栬ˉ涓婚敭 + * @return 鐗╂祦鍙戝睍濂栬ˉ + */ + @Override + public BmsLogisticsDevelopmentAward selectBmsLogisticsDevelopmentAwardById(Long id) { + return baseMapper.selectBmsLogisticsDevelopmentAwardById(id); + } + + /** + * 鏌ヨ鐗╂祦鍙戝睍濂栬ˉ鍒楄〃 + * + * @param bmsLogisticsDevelopmentAward 鐗╂祦鍙戝睍濂栬ˉ + * @return 鐗╂祦鍙戝睍濂栬ˉ + */ + @Override + public List selectBmsLogisticsDevelopmentAwardList(BmsLogisticsDevelopmentAward bmsLogisticsDevelopmentAward) { + return baseMapper.selectBmsLogisticsDevelopmentAwardList(bmsLogisticsDevelopmentAward); + } + + /** + * 鏂板鐗╂祦鍙戝睍濂栬ˉ + * + * @param bmsLogisticsDevelopmentAwardAddDto 鐗╂祦鍙戝睍濂栬ˉ + * @return 缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int insertBmsLogisticsDevelopmentAward(BmsLogisticsDevelopmentAwardAddDto bmsLogisticsDevelopmentAwardAddDto) { + Long enterpriseId = iCommonService.checkEnterprise(bmsLogisticsDevelopmentAwardAddDto.getCreditCode() + ,bmsLogisticsDevelopmentAwardAddDto.getTemplateRecordId()); + // check 鐢虫姤淇℃伅 + iCommonService.checkDeclaration(bmsLogisticsDevelopmentAwardAddDto.getCreditCode() + ,bmsLogisticsDevelopmentAwardAddDto.getTemplateRecordId()); + BmsLogisticsDevelopmentAward bmsLogisticsDevelopmentAward = new BmsLogisticsDevelopmentAward(); + + BeanUtil.copyProperties(bmsLogisticsDevelopmentAwardAddDto,bmsLogisticsDevelopmentAward); + bmsLogisticsDevelopmentAward.setEnterpriseId(enterpriseId); + // 鏂板鍋氬ぇ鍋氬己濂栬鎯 + int num = baseMapper.insert(bmsLogisticsDevelopmentAward); + + // 鏂板鐢宠璁板綍 + BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); + BeanUtil.copyProperties(bmsLogisticsDevelopmentAwardAddDto,declarationRecords); + declarationRecords.setMatter("鎻愪氦鐗╂祦鍙戝睍濂栬ˉ鐢宠"); + declarationRecords.setEnterpriseId(enterpriseId); + declarationRecords.setDetailId(bmsLogisticsDevelopmentAward.getId()); + iBmsDeclarationRecordsService.save(declarationRecords); + // 鐢熸垚瀹℃牳 + if (bmsLogisticsDevelopmentAwardAddDto.getStatus()==1){ + // 瀹℃壒鐘舵 + iCommonService.insertAuditRecord(declarationRecords.getId(),0); + } + return num; + } + + /** + * 淇敼鐗╂祦鍙戝睍濂栬ˉ + * + * @param bmsLogisticsDevelopmentAwardUpdateDto 鐗╂祦鍙戝睍濂栬ˉ + * @return 缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int updateBmsLogisticsDevelopmentAward(BmsLogisticsDevelopmentAwardUpdateDto bmsLogisticsDevelopmentAwardUpdateDto) { + int num = 0; + try { + iBmsDeclarationRecordsService.updateDeclarationRecords(bmsLogisticsDevelopmentAwardUpdateDto.getDeclarationRecordsId() + ,bmsLogisticsDevelopmentAwardUpdateDto.getProjectId(),bmsLogisticsDevelopmentAwardUpdateDto.getProjectName() + ,bmsLogisticsDevelopmentAwardUpdateDto.getStatus()); + + iBmsDeclarationRecordsService.updateProjectNameById(bmsLogisticsDevelopmentAwardUpdateDto.getId() + ,bmsLogisticsDevelopmentAwardUpdateDto.getProjectName(),bmsLogisticsDevelopmentAwardUpdateDto.getProjectId()); + bmsLogisticsDevelopmentAwardUpdateDto.setUpdateTime(DateUtils.getNowDate()); + num = baseMapper.updateBmsLogisticsDevelopmentAward(bmsLogisticsDevelopmentAwardUpdateDto); + // 鐢宠瀹℃壒 + if (bmsLogisticsDevelopmentAwardUpdateDto.getStatus()==1){ + // 瀹℃壒鐘舵 + iCommonService.insertAuditRecord(bmsLogisticsDevelopmentAwardUpdateDto.getDeclarationRecordsId(),0); + } + }catch (Exception e){ + e.printStackTrace(); + } + return num; + } + + /** + * 鎵归噺鍒犻櫎鐗╂祦鍙戝睍濂栬ˉ + * + * @param ids 闇瑕佸垹闄ょ殑鐗╂祦鍙戝睍濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsLogisticsDevelopmentAwardByIds(Long[] ids) { + return baseMapper.deleteBmsLogisticsDevelopmentAwardByIds(ids); + } + + /** + * 鍒犻櫎鐗╂祦鍙戝睍濂栬ˉ淇℃伅 + * + * @param id 鐗╂祦鍙戝睍濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsLogisticsDevelopmentAwardById(Long id) { + return baseMapper.deleteBmsLogisticsDevelopmentAwardById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsManufacturingServicesAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsManufacturingServicesAwardServiceImpl.java new file mode 100644 index 0000000..aa5af54 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsManufacturingServicesAwardServiceImpl.java @@ -0,0 +1,141 @@ +package com.ruoyi.jjh.declaration.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; +import com.ruoyi.jjh.declaration.entity.BmsManufacturingServicesAward; +import com.ruoyi.jjh.declaration.entity.dto.BmsManufacturingServicesAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsManufacturingServicesAwardUpdateDto; +import com.ruoyi.jjh.declaration.mapper.BmsManufacturingServicesAwardMapper; +import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; +import com.ruoyi.jjh.declaration.service.IBmsManufacturingServicesAwardService; +import com.ruoyi.jjh.declaration.service.ICommonService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉService涓氬姟灞傚鐞 + * + * @author farben + * @date 2023-08-25 + */ +@Service +public class BmsManufacturingServicesAwardServiceImpl extends ServiceImpl implements IBmsManufacturingServicesAwardService { + + @Autowired + private ICommonService iCommonService; + + @Autowired + private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; + + /** + * 鏌ヨ鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + * + * @param id 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ涓婚敭 + * @return 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + */ + @Override + public BmsManufacturingServicesAward selectBmsManufacturingServicesAwardById(Long id) { + return baseMapper.selectBmsManufacturingServicesAwardById(id); + } + + /** + * 鏌ヨ鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ鍒楄〃 + * + * @param bmsManufacturingServicesAward 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + * @return 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + */ + @Override + public List selectBmsManufacturingServicesAwardList(BmsManufacturingServicesAward bmsManufacturingServicesAward) { + return baseMapper.selectBmsManufacturingServicesAwardList(bmsManufacturingServicesAward); + } + + /** + * 鏂板鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + * + * @param bmsManufacturingServicesAwardAddDto 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + * @return 缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int insertBmsManufacturingServicesAward(BmsManufacturingServicesAwardAddDto bmsManufacturingServicesAwardAddDto) { + Long enterpriseId = iCommonService.checkEnterprise(bmsManufacturingServicesAwardAddDto.getCreditCode() + ,bmsManufacturingServicesAwardAddDto.getTemplateRecordId()); + // check 鐢虫姤淇℃伅 + iCommonService.checkDeclaration(bmsManufacturingServicesAwardAddDto.getCreditCode() + ,bmsManufacturingServicesAwardAddDto.getTemplateRecordId()); + BmsManufacturingServicesAward bmsManufacturingServicesAward = new BmsManufacturingServicesAward(); + BeanUtil.copyProperties(bmsManufacturingServicesAwardAddDto,bmsManufacturingServicesAward); + bmsManufacturingServicesAward.setEnterpriseId(enterpriseId); + // 鏂板鍋氬ぇ鍋氬己濂栬鎯 + int num = baseMapper.insert(bmsManufacturingServicesAward); + + // 鏂板鐢宠璁板綍 + BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); + BeanUtil.copyProperties(bmsManufacturingServicesAwardAddDto,declarationRecords); + declarationRecords.setMatter("鎻愪氦鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ鐢宠"); + declarationRecords.setEnterpriseId(enterpriseId); + declarationRecords.setDetailId(bmsManufacturingServicesAward.getId()); + iBmsDeclarationRecordsService.save(declarationRecords); + // 鐢熸垚瀹℃牳 + if (bmsManufacturingServicesAwardAddDto.getStatus()==1){ + // 瀹℃壒鐘舵 + iCommonService.insertAuditRecord(declarationRecords.getId(),0); + } + return num; + } + + /** + * 淇敼鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + * + * @param bmsManufacturingServicesAwardUpdateDto 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + * @return 缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int updateBmsManufacturingServicesAward(BmsManufacturingServicesAwardUpdateDto bmsManufacturingServicesAwardUpdateDto) { + int num = 0; + try { + iBmsDeclarationRecordsService.updateDeclarationRecords(bmsManufacturingServicesAwardUpdateDto.getDeclarationRecordsId() + ,bmsManufacturingServicesAwardUpdateDto.getProjectId(),bmsManufacturingServicesAwardUpdateDto.getProjectName() + ,bmsManufacturingServicesAwardUpdateDto.getStatus()); + + bmsManufacturingServicesAwardUpdateDto.setUpdateTime(DateUtils.getNowDate()); + num = baseMapper.updateBmsManufacturingServicesAward(bmsManufacturingServicesAwardUpdateDto); + // 鐢宠瀹℃壒 + if (bmsManufacturingServicesAwardUpdateDto.getStatus()==1){ + // 瀹℃壒鐘舵 + iCommonService.insertAuditRecord(bmsManufacturingServicesAwardUpdateDto.getDeclarationRecordsId(),0); + } + }catch (Exception e){ + e.printStackTrace(); + } + return num; + } + + /** + * 鎵归噺鍒犻櫎鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + * + * @param ids 闇瑕佸垹闄ょ殑鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsManufacturingServicesAwardByIds(Long[] ids) { + return baseMapper.deleteBmsManufacturingServicesAwardByIds(ids); + } + + /** + * 鍒犻櫎鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ淇℃伅 + * + * @param id 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsManufacturingServicesAwardById(Long id) { + return baseMapper.deleteBmsManufacturingServicesAwardById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsPlatformConstructionAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsPlatformConstructionAwardServiceImpl.java new file mode 100644 index 0000000..4ce7593 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsPlatformConstructionAwardServiceImpl.java @@ -0,0 +1,145 @@ +package com.ruoyi.jjh.declaration.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; +import com.ruoyi.jjh.declaration.entity.BmsPlatformConstructionAward; +import com.ruoyi.jjh.declaration.entity.dto.BmsPlatformConstructionAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsPlatformConstructionAwardUpdateDto; +import com.ruoyi.jjh.declaration.mapper.BmsPlatformConstructionAwardMapper; +import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; +import com.ruoyi.jjh.declaration.service.IBmsPlatformConstructionAwardService; +import com.ruoyi.jjh.declaration.service.ICommonService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 骞冲彴寤鸿濂栬ˉService涓氬姟灞傚鐞 + * + * @author farben + * @date 2023-08-25 + */ +@Service +@Lazy +public class BmsPlatformConstructionAwardServiceImpl extends ServiceImpl implements IBmsPlatformConstructionAwardService { + + @Autowired + private ICommonService iCommonService; + + @Autowired + private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; + + /** + * 鏌ヨ骞冲彴寤鸿濂栬ˉ + * + * @param id 骞冲彴寤鸿濂栬ˉ涓婚敭 + * @return 骞冲彴寤鸿濂栬ˉ + */ + @Override + public BmsPlatformConstructionAward selectBmsPlatformConstructionAwardById(Long id) { + return baseMapper.selectBmsPlatformConstructionAwardById(id); + } + + /** + * 鏌ヨ骞冲彴寤鸿濂栬ˉ鍒楄〃 + * + * @param bmsPlatformConstructionAward 骞冲彴寤鸿濂栬ˉ + * @return 骞冲彴寤鸿濂栬ˉ + */ + @Override + public List selectBmsPlatformConstructionAwardList(BmsPlatformConstructionAward bmsPlatformConstructionAward) { + return baseMapper.selectBmsPlatformConstructionAwardList(bmsPlatformConstructionAward); + } + + /** + * 鏂板骞冲彴寤鸿濂栬ˉ + * + * @param bmsPlatformConstructionAwardAddDto 骞冲彴寤鸿濂栬ˉ + * @return 缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int insertBmsPlatformConstructionAward(BmsPlatformConstructionAwardAddDto bmsPlatformConstructionAwardAddDto) { + Long enterpriseId = iCommonService.checkEnterprise(bmsPlatformConstructionAwardAddDto.getCreditCode() + ,bmsPlatformConstructionAwardAddDto.getTemplateRecordId()); + // check 鐢虫姤淇℃伅 + iCommonService.checkDeclaration(bmsPlatformConstructionAwardAddDto.getCreditCode() + ,bmsPlatformConstructionAwardAddDto.getTemplateRecordId()); + BmsPlatformConstructionAward bmsPlatformConstructionAward = new BmsPlatformConstructionAward(); + BeanUtil.copyProperties(bmsPlatformConstructionAwardAddDto,bmsPlatformConstructionAward); + bmsPlatformConstructionAward.setEnterpriseId(enterpriseId); + // 鏂板鍋氬ぇ鍋氬己濂栬鎯 + int num = baseMapper.insert(bmsPlatformConstructionAward); + + // 鏂板鐢宠璁板綍 + BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); + BeanUtil.copyProperties(bmsPlatformConstructionAwardAddDto,declarationRecords); + declarationRecords.setMatter("鎻愪氦骞冲彴寤鸿濂栬ˉ鐢宠"); + declarationRecords.setEnterpriseId(enterpriseId); + declarationRecords.setDetailId(bmsPlatformConstructionAward.getId()); + iBmsDeclarationRecordsService.save(declarationRecords); + // 鐢熸垚瀹℃牳 + if (bmsPlatformConstructionAwardAddDto.getStatus()==1){ + // 瀹℃壒鐘舵 + iCommonService.insertAuditRecord(declarationRecords.getId(),0); + } + return num; + } + + /** + * 淇敼骞冲彴寤鸿濂栬ˉ + * + * @param bmsPlatformConstructionAwardUpdateDto 骞冲彴寤鸿濂栬ˉ + * @return 缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int updateBmsPlatformConstructionAward(BmsPlatformConstructionAwardUpdateDto bmsPlatformConstructionAwardUpdateDto) { + int num = 0; + try { + iBmsDeclarationRecordsService.updateDeclarationRecords(bmsPlatformConstructionAwardUpdateDto.getDeclarationRecordsId() + ,bmsPlatformConstructionAwardUpdateDto.getProjectId(),bmsPlatformConstructionAwardUpdateDto.getProjectName() + ,bmsPlatformConstructionAwardUpdateDto.getStatus()); + + iBmsDeclarationRecordsService.updateProjectNameById(bmsPlatformConstructionAwardUpdateDto.getId() + ,bmsPlatformConstructionAwardUpdateDto.getProjectName(),bmsPlatformConstructionAwardUpdateDto.getProjectId()); + bmsPlatformConstructionAwardUpdateDto.setUpdateTime(DateUtils.getNowDate()); + num = baseMapper.updateBmsPlatformConstructionAward(bmsPlatformConstructionAwardUpdateDto); + // 鐢宠瀹℃壒 + if (bmsPlatformConstructionAwardUpdateDto.getStatus()==1){ + // 瀹℃壒鐘舵 + iCommonService.insertAuditRecord(bmsPlatformConstructionAwardUpdateDto.getDeclarationRecordsId(),0); + } + }catch (Exception e){ + e.printStackTrace(); + } + return num; + } + + /** + * 鎵归噺鍒犻櫎骞冲彴寤鸿濂栬ˉ + * + * @param ids 闇瑕佸垹闄ょ殑骞冲彴寤鸿濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsPlatformConstructionAwardByIds(Long[] ids) { + return baseMapper.deleteBmsPlatformConstructionAwardByIds(ids); + } + + /** + * 鍒犻櫎骞冲彴寤鸿濂栬ˉ淇℃伅 + * + * @param id 骞冲彴寤鸿濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsPlatformConstructionAwardById(Long id) { + return baseMapper.deleteBmsPlatformConstructionAwardById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsProcessInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsProcessInfoServiceImpl.java new file mode 100644 index 0000000..03ae406 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsProcessInfoServiceImpl.java @@ -0,0 +1,88 @@ +package com.ruoyi.jjh.declaration.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.jjh.declaration.entity.BmsProcessInfo; +import com.ruoyi.jjh.declaration.mapper.BmsProcessInfoMapper; +import com.ruoyi.jjh.declaration.service.IBmsProcessInfoService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 瀹℃壒娴佺▼Service涓氬姟灞傚鐞 + * + * @author farben + * @date 2023-09-09 + */ +@Service +public class BmsProcessInfoServiceImpl extends ServiceImpl implements IBmsProcessInfoService { + + /** + * 鏌ヨ瀹℃壒娴佺▼ + * + * @param id 瀹℃壒娴佺▼涓婚敭 + * @return 瀹℃壒娴佺▼ + */ + @Override + public BmsProcessInfo selectBmsProcessInfoById(Long id) { + return baseMapper.selectBmsProcessInfoById(id); + } + + /** + * 鏌ヨ瀹℃壒娴佺▼鍒楄〃 + * + * @param bmsProcessInfo 瀹℃壒娴佺▼ + * @return 瀹℃壒娴佺▼ + */ + @Override + public List selectBmsProcessInfoList(BmsProcessInfo bmsProcessInfo) { + return baseMapper.selectBmsProcessInfoList(bmsProcessInfo); + } + + /** + * 鏂板瀹℃壒娴佺▼ + * + * @param bmsProcessInfo 瀹℃壒娴佺▼ + * @return 缁撴灉 + */ + @Override + public int insertBmsProcessInfo(BmsProcessInfo bmsProcessInfo) { + bmsProcessInfo.setCreateTime(DateUtils.getNowDate()); + return baseMapper.insertBmsProcessInfo(bmsProcessInfo); + } + + /** + * 淇敼瀹℃壒娴佺▼ + * + * @param bmsProcessInfo 瀹℃壒娴佺▼ + * @return 缁撴灉 + */ + @Override + public int updateBmsProcessInfo(BmsProcessInfo bmsProcessInfo) { + bmsProcessInfo.setUpdateTime(DateUtils.getNowDate()); + return baseMapper.updateBmsProcessInfo(bmsProcessInfo); + } + + /** + * 鎵归噺鍒犻櫎瀹℃壒娴佺▼ + * + * @param ids 闇瑕佸垹闄ょ殑瀹℃壒娴佺▼涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsProcessInfoByIds(Long[] ids) { + return baseMapper.deleteBmsProcessInfoByIds(ids); + } + + /** + * 鍒犻櫎瀹℃壒娴佺▼淇℃伅 + * + * @param id 瀹℃壒娴佺▼涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsProcessInfoById(Long id) { + return baseMapper.deleteBmsProcessInfoById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsProjectInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsProjectInfoServiceImpl.java new file mode 100644 index 0000000..9f20f22 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsProjectInfoServiceImpl.java @@ -0,0 +1,94 @@ +package com.ruoyi.jjh.declaration.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.jjh.declaration.entity.BmsProjectInfo; +import com.ruoyi.jjh.declaration.mapper.BmsProjectInfoMapper; +import com.ruoyi.jjh.declaration.service.IBmsProjectInfoService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 椤圭洰鍩烘湰淇℃伅Service涓氬姟灞傚鐞 + * + * @author farben + * @date 2023-09-09 + */ +@Service +public class BmsProjectInfoServiceImpl extends ServiceImpl implements IBmsProjectInfoService { + + + /** + * 鏌ヨ椤圭洰鍩烘湰淇℃伅 + * + * @param id 椤圭洰鍩烘湰淇℃伅涓婚敭 + * @return 椤圭洰鍩烘湰淇℃伅 + */ + @Override + public BmsProjectInfo selectBmsProjectInfoById(Long id) { + return baseMapper.selectBmsProjectInfoById(id); + } + + /** + * 鏌ヨ椤圭洰鍩烘湰淇℃伅鍒楄〃 + * + * @param bmsProjectInfo 椤圭洰鍩烘湰淇℃伅 + * @return 椤圭洰鍩烘湰淇℃伅 + */ + @Override + public List selectBmsProjectInfoList(BmsProjectInfo bmsProjectInfo) { + return baseMapper.selectBmsProjectInfoList(bmsProjectInfo); + } + + /** + * 鏂板椤圭洰鍩烘湰淇℃伅 + * + * @param bmsProjectInfo 椤圭洰鍩烘湰淇℃伅 + * @return 缁撴灉 + */ + @Override + public int insertBmsProjectInfo(BmsProjectInfo bmsProjectInfo) { + bmsProjectInfo.setCreateTime(DateUtils.getNowDate()); + return baseMapper.insertBmsProjectInfo(bmsProjectInfo); + } + + /** + * 淇敼椤圭洰鍩烘湰淇℃伅 + * + * @param bmsProjectInfo 椤圭洰鍩烘湰淇℃伅 + * @return 缁撴灉 + */ + @Override + public int updateBmsProjectInfo(BmsProjectInfo bmsProjectInfo) { + bmsProjectInfo.setUpdateTime(DateUtils.getNowDate()); + return baseMapper.updateBmsProjectInfo(bmsProjectInfo); + } + + /** + * 鎵归噺鍒犻櫎椤圭洰鍩烘湰淇℃伅 + * + * @param ids 闇瑕佸垹闄ょ殑椤圭洰鍩烘湰淇℃伅涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsProjectInfoByIds(Long[] ids) { + return baseMapper.deleteBmsProjectInfoByIds(ids); + } + + /** + * 鍒犻櫎椤圭洰鍩烘湰淇℃伅淇℃伅 + * + * @param id 椤圭洰鍩烘湰淇℃伅涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsProjectInfoById(Long id) { + return baseMapper.deleteBmsProjectInfoById(id); + } + + @Override + public BmsProjectInfo getProjectInfo(Long templateRecordId){ + return baseMapper.getProjectInfo(templateRecordId); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsProjectSettlementAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsProjectSettlementAwardServiceImpl.java new file mode 100644 index 0000000..a5e33b3 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsProjectSettlementAwardServiceImpl.java @@ -0,0 +1,165 @@ +package com.ruoyi.jjh.declaration.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; +import com.ruoyi.jjh.declaration.entity.BmsFundingDetail; +import com.ruoyi.jjh.declaration.entity.BmsProjectSettlementAward; +import com.ruoyi.jjh.declaration.entity.dto.BmsFundingDetailAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsProjectSettlementAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsProjectSettlementAwardUpdateDto; +import com.ruoyi.jjh.declaration.entity.vo.BmsProjectSettlementAwardQueryVo; +import com.ruoyi.jjh.declaration.mapper.BmsProjectSettlementAwardMapper; +import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; +import com.ruoyi.jjh.declaration.service.IBmsFundingDetailService; +import com.ruoyi.jjh.declaration.service.IBmsProjectSettlementAwardService; +import com.ruoyi.jjh.declaration.service.ICommonService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +/** + * 椤圭洰钀芥埛濂栬ˉService涓氬姟灞傚鐞 + * + * @author farben + * @date 2023-08-25 + */ +@Service +@Lazy +public class BmsProjectSettlementAwardServiceImpl extends ServiceImpl implements IBmsProjectSettlementAwardService { + + @Autowired + private ICommonService iCommonService; + + + @Autowired + private IBmsFundingDetailService iBmsFundingDetailService; + + @Autowired + private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; + + /** + * 鏌ヨ椤圭洰钀芥埛濂栬ˉ + * + * @param id 椤圭洰钀芥埛濂栬ˉ涓婚敭 + * @return 椤圭洰钀芥埛濂栬ˉ + */ + @Override + public BmsProjectSettlementAwardQueryVo selectBmsProjectSettlementAwardById(Long id) { + return baseMapper.selectBmsProjectSettlementAwardById(id); + } + + /** + * 鏌ヨ椤圭洰钀芥埛濂栬ˉ鍒楄〃 + * + * @param bmsProjectSettlementAward 椤圭洰钀芥埛濂栬ˉ + * @return 椤圭洰钀芥埛濂栬ˉ + */ + @Override + public List selectBmsProjectSettlementAwardList(BmsProjectSettlementAward bmsProjectSettlementAward) { + return baseMapper.selectBmsProjectSettlementAwardList(bmsProjectSettlementAward); + } + + /** + * 鏂板椤圭洰钀芥埛濂栬ˉ + * + * @param bmsProjectSettlementAwardAddDto 椤圭洰钀芥埛濂栬ˉ + * @return 缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int insertBmsProjectSettlementAward(BmsProjectSettlementAwardAddDto bmsProjectSettlementAwardAddDto) { + + //妫娴嬩紒涓氫俊鎭 + Long enterpriseId = iCommonService.checkEnterprise(bmsProjectSettlementAwardAddDto.getCreditCode() + , bmsProjectSettlementAwardAddDto.getTemplateRecordId()); + // check 鐢虫姤淇℃伅 + iCommonService.checkDeclaration(bmsProjectSettlementAwardAddDto.getCreditCode() + , bmsProjectSettlementAwardAddDto.getTemplateRecordId()); + BmsProjectSettlementAward projectSettlementAward = new BmsProjectSettlementAward(); + BeanUtil.copyProperties(bmsProjectSettlementAwardAddDto, projectSettlementAward); + projectSettlementAward.setEnterpriseId(enterpriseId); + // 鏂板椤圭洰钀芥埛濂栬ˉ瀵硅薄 + int num = baseMapper.insert(projectSettlementAward); + List fundingDetailAddList = bmsProjectSettlementAwardAddDto.getFundingDetailList(); + List fundingDetailList = new ArrayList<>(); + fundingDetailAddList.forEach(x -> { + BmsFundingDetail fundingDetail = new BmsFundingDetail(); + BeanUtil.copyProperties(x, fundingDetail); + fundingDetail.setType(1); + fundingDetail.setTemplateRecordId(bmsProjectSettlementAwardAddDto.getTemplateRecordId()); + fundingDetail.setDetailId(projectSettlementAward.getId()); + fundingDetailList.add(fundingDetail); + }); + // 鎵归噺鏂板璧勯噾淇℃伅 + iBmsFundingDetailService.saveOrUpdateBatch(fundingDetailList); + // 鏂板鐢宠璁板綍 + BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); + BeanUtil.copyProperties(bmsProjectSettlementAwardAddDto, declarationRecords); + declarationRecords.setMatter("鎻愪氦钀芥埛濂栬ˉ鐢宠"); + declarationRecords.setEnterpriseId(enterpriseId); + declarationRecords.setDetailId(projectSettlementAward.getId()); + iBmsDeclarationRecordsService.save(declarationRecords); + // 鐢熸垚瀹℃牳 + if (bmsProjectSettlementAwardAddDto.getStatus() == 1) { + // 瀹℃壒鐘舵 + iCommonService.insertAuditRecord(declarationRecords.getId(), 0); + } + return num; + } + + /** + * 淇敼椤圭洰钀芥埛濂栬ˉ + * + * @param bmsProjectSettlementAwardUpdateDto 椤圭洰钀芥埛濂栬ˉ + * @return 缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int updateBmsProjectSettlementAward(BmsProjectSettlementAwardUpdateDto bmsProjectSettlementAwardUpdateDto) { + int num = 0; + try { + iBmsDeclarationRecordsService.updateDeclarationRecords(bmsProjectSettlementAwardUpdateDto.getDeclarationRecordsId() + , bmsProjectSettlementAwardUpdateDto.getProjectId(), bmsProjectSettlementAwardUpdateDto.getProjectName() + , bmsProjectSettlementAwardUpdateDto.getStatus()); + + num = baseMapper.updateBmsProjectSettlementAward(bmsProjectSettlementAwardUpdateDto); + List fundingDetailList = bmsProjectSettlementAwardUpdateDto.getFundingDetailList(); + iBmsFundingDetailService.saveOrUpdateBatch(fundingDetailList); + // 鐢宠瀹℃壒 + if (bmsProjectSettlementAwardUpdateDto.getStatus() == 1) { + // 瀹℃壒鐘舵 + iCommonService.insertAuditRecord(bmsProjectSettlementAwardUpdateDto.getDeclarationRecordsId(), 0); + } + } catch (Exception e) { + e.printStackTrace(); + } + return num; + } + + /** + * 鎵归噺鍒犻櫎椤圭洰钀芥埛濂栬ˉ + * + * @param ids 闇瑕佸垹闄ょ殑椤圭洰钀芥埛濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsProjectSettlementAwardByIds(Long[] ids) { + return baseMapper.deleteBmsProjectSettlementAwardByIds(ids); + } + + /** + * 鍒犻櫎椤圭洰钀芥埛濂栬ˉ淇℃伅 + * + * @param id 椤圭洰钀芥埛濂栬ˉ涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsProjectSettlementAwardById(Long id) { + return baseMapper.deleteBmsProjectSettlementAwardById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsSceneOpeningAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsSceneOpeningAwardServiceImpl.java new file mode 100644 index 0000000..31cda92 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsSceneOpeningAwardServiceImpl.java @@ -0,0 +1,141 @@ +package com.ruoyi.jjh.declaration.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; +import com.ruoyi.jjh.declaration.entity.BmsSceneOpeningAward; +import com.ruoyi.jjh.declaration.entity.dto.BmsSceneOpeningAwardAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsSceneOpeningAwardUpdateDto; +import com.ruoyi.jjh.declaration.mapper.BmsSceneOpeningAwardMapper; +import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; +import com.ruoyi.jjh.declaration.service.IBmsSceneOpeningAwardService; +import com.ruoyi.jjh.declaration.service.ICommonService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 鍦烘櫙寮鏀惧琛ervice涓氬姟灞傚鐞 + * + * @author farben + * @date 2023-08-25 + */ +@Service +public class BmsSceneOpeningAwardServiceImpl extends ServiceImpl implements IBmsSceneOpeningAwardService { + + @Autowired + private ICommonService iCommonService; + + @Autowired + private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; + + /** + * 鏌ヨ鍦烘櫙寮鏀惧琛 + * + * @param id 鍦烘櫙寮鏀惧琛ヤ富閿 + * @return 鍦烘櫙寮鏀惧琛 + */ + @Override + public BmsSceneOpeningAward selectBmsSceneOpeningAwardById(Long id) { + return baseMapper.selectBmsSceneOpeningAwardById(id); + } + + /** + * 鏌ヨ鍦烘櫙寮鏀惧琛ュ垪琛 + * + * @param bmsSceneOpeningAward 鍦烘櫙寮鏀惧琛 + * @return 鍦烘櫙寮鏀惧琛 + */ + @Override + public List selectBmsSceneOpeningAwardList(BmsSceneOpeningAward bmsSceneOpeningAward) { + return baseMapper.selectBmsSceneOpeningAwardList(bmsSceneOpeningAward); + } + + /** + * 鏂板鍦烘櫙寮鏀惧琛 + * + * @param bmsSceneOpeningAwardAddDto 鍦烘櫙寮鏀惧琛 + * @return 缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int insertBmsSceneOpeningAward(BmsSceneOpeningAwardAddDto bmsSceneOpeningAwardAddDto) { + Long enterpriseId = iCommonService.checkEnterprise(bmsSceneOpeningAwardAddDto.getCreditCode() + ,bmsSceneOpeningAwardAddDto.getTemplateRecordId()); + // check 鐢虫姤淇℃伅 + iCommonService.checkDeclaration(bmsSceneOpeningAwardAddDto.getCreditCode() + ,bmsSceneOpeningAwardAddDto.getTemplateRecordId()); + BmsSceneOpeningAward bmsSceneOpeningAward = new BmsSceneOpeningAward(); + BeanUtil.copyProperties(bmsSceneOpeningAwardAddDto,bmsSceneOpeningAward); + bmsSceneOpeningAward.setEnterpriseId(enterpriseId); + // 鏂板鍋氬ぇ鍋氬己濂栬鎯 + int num = baseMapper.insert(bmsSceneOpeningAward); + + // 鏂板鐢宠璁板綍 + BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords(); + BeanUtil.copyProperties(bmsSceneOpeningAwardAddDto,declarationRecords); + declarationRecords.setMatter("鎻愪氦鍦烘櫙寮鏀惧琛ョ敵璇"); + declarationRecords.setEnterpriseId(enterpriseId); + declarationRecords.setDetailId(bmsSceneOpeningAward.getId()); + iBmsDeclarationRecordsService.save(declarationRecords); + // 鐢熸垚瀹℃牳 + if (bmsSceneOpeningAwardAddDto.getStatus()==1){ + // 瀹℃壒鐘舵 + iCommonService.insertAuditRecord(declarationRecords.getId(),0); + } + return num; + } + + /** + * 淇敼鍦烘櫙寮鏀惧琛 + * + * @param bmsSceneOpeningAwardUpdateDto 鍦烘櫙寮鏀惧琛 + * @return 缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int updateBmsSceneOpeningAward(BmsSceneOpeningAwardUpdateDto bmsSceneOpeningAwardUpdateDto) { + int num = 0; + try { + iBmsDeclarationRecordsService.updateDeclarationRecords(bmsSceneOpeningAwardUpdateDto.getDeclarationRecordsId() + ,bmsSceneOpeningAwardUpdateDto.getProjectId(),bmsSceneOpeningAwardUpdateDto.getProjectName() + ,bmsSceneOpeningAwardUpdateDto.getStatus()); + + bmsSceneOpeningAwardUpdateDto.setUpdateTime(DateUtils.getNowDate()); + num=baseMapper.updateBmsSceneOpeningAward(bmsSceneOpeningAwardUpdateDto); + // 鐢宠瀹℃壒 + if (bmsSceneOpeningAwardUpdateDto.getStatus()==1){ + // 瀹℃壒鐘舵 + iCommonService.insertAuditRecord(bmsSceneOpeningAwardUpdateDto.getDeclarationRecordsId(),0); + } + }catch (Exception e){ + e.printStackTrace(); + } + return num; + } + + /** + * 鎵归噺鍒犻櫎鍦烘櫙寮鏀惧琛 + * + * @param ids 闇瑕佸垹闄ょ殑鍦烘櫙寮鏀惧琛ヤ富閿 + * @return 缁撴灉 + */ + @Override + public int deleteBmsSceneOpeningAwardByIds(Long[] ids) { + return baseMapper.deleteBmsSceneOpeningAwardByIds(ids); + } + + /** + * 鍒犻櫎鍦烘櫙寮鏀惧琛ヤ俊鎭 + * + * @param id 鍦烘櫙寮鏀惧琛ヤ富閿 + * @return 缁撴灉 + */ + @Override + public int deleteBmsSceneOpeningAwardById(Long id) { + return baseMapper.deleteBmsSceneOpeningAwardById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateInfoServiceImpl.java new file mode 100644 index 0000000..b200420 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateInfoServiceImpl.java @@ -0,0 +1,158 @@ +package com.ruoyi.jjh.declaration.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.file.FileUtils; +import com.ruoyi.jjh.declaration.entity.BmsTemplateInfo; +import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateInfoQueryVo; +import com.ruoyi.jjh.declaration.mapper.BmsTemplateInfoMapper; +import com.ruoyi.jjh.declaration.service.IBmsEnterpriseDirectoryService; +import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.List; + +/** + * 鐢虫姤妯℃澘淇℃伅Service涓氬姟灞傚鐞 + * + * @author farben + * @date 2023-08-25 + */ +@Service +public class BmsTemplateInfoServiceImpl extends ServiceImpl implements IBmsTemplateInfoService { + + @Autowired + private IBmsEnterpriseDirectoryService enterpriseDirectoryService; + + /** + * 鏌ヨ鐢虫姤妯℃澘淇℃伅 + * + * @param id 鐢虫姤妯℃澘淇℃伅涓婚敭 + * @return 鐢虫姤妯℃澘淇℃伅 + */ + @Override + public BmsTemplateInfo selectBmsTemplateInfoById(Long id) { + return baseMapper.selectBmsTemplateInfoById(id); + } + + /** + * 鏌ヨ鐢虫姤妯℃澘淇℃伅鍒楄〃 + * + * @param bmsTemplateInfo 鐢虫姤妯℃澘淇℃伅 + * @return 鐢虫姤妯℃澘淇℃伅 + */ + @Override + public List selectBmsTemplateInfoList(BmsTemplateInfo bmsTemplateInfo) { + return baseMapper.templateInfoList(bmsTemplateInfo); + } + + /** + * 瀵煎嚭妯℃澘琛ㄥ崟 + * + * @param request + * @param response + * @param id + * @return + * @author emiya.xie + * @create 2023/8/31 10:25 + */ + @Override + public void exportTemplate(HttpServletRequest request, HttpServletResponse response, Long id) { + BmsTemplateInfo bmsTemplateInfo = baseMapper.selectById(id); + if (BeanUtil.isEmpty(bmsTemplateInfo)) { + throw new ServiceException("娌℃湁鎵惧埌鍚堥傜殑妯℃澘锛"); + } + String fileName = bmsTemplateInfo.getTemplateName() + ".xlsx"; + String file = "/template/" + fileName; + InputStream is = this.getClass().getResourceAsStream(file); + byte[] fileData = new byte[0]; + try { + fileData = input2byte(is); + } catch (IOException e) { + e.printStackTrace(); + } + FileUtils.downloadFile(response, request, fileName, fileData); + } + + private byte[] input2byte(InputStream inStream) + throws IOException { + ByteArrayOutputStream swapStream = new ByteArrayOutputStream(); + byte[] buff = new byte[100]; + int rc = 0; + while ((rc = inStream.read(buff, 0, 100)) > 0) { + swapStream.write(buff, 0, rc); + } + byte[] in2b = swapStream.toByteArray(); + return in2b; + } + + /** + * 鏂板鐢虫姤妯℃澘淇℃伅 + * + * @param bmsTemplateInfo 鐢虫姤妯℃澘淇℃伅 + * @return 缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int insertBmsTemplateInfo(BmsTemplateInfo bmsTemplateInfo) { + int num = 0; + try { + bmsTemplateInfo.setCreateTime(DateUtils.getNowDate()); + num = baseMapper.insertBmsTemplateInfo(bmsTemplateInfo); +// List enterpriseDirectoryList = bmsTemplateInfo +// .getEnterpriseDirectoryList(); +// if (null != enterpriseDirectoryList && enterpriseDirectoryList.size()>0){ +// enterpriseDirectoryList.forEach(x->{ +// x.setTemplateId(bmsTemplateInfoAddDto.getId()); +// }); +// enterpriseDirectoryService.saveOrUpdateBatch(enterpriseDirectoryList); +// } + } catch (Exception e) { + e.printStackTrace(); + } + return num; + } + + /** + * 淇敼鐢虫姤妯℃澘淇℃伅 + * + * @param bmsTemplateInfo 鐢虫姤妯℃澘淇℃伅 + * @return 缁撴灉 + */ + @Override + public int updateBmsTemplateInfo(BmsTemplateInfo bmsTemplateInfo) { + bmsTemplateInfo.setUpdateTime(DateUtils.getNowDate()); + return baseMapper.updateBmsTemplateInfo(bmsTemplateInfo); + } + + /** + * 鎵归噺鍒犻櫎鐢虫姤妯℃澘淇℃伅 + * + * @param ids 闇瑕佸垹闄ょ殑鐢虫姤妯℃澘淇℃伅涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsTemplateInfoByIds(Long[] ids) { + return baseMapper.deleteBmsTemplateInfoByIds(ids); + } + + /** + * 鍒犻櫎鐢虫姤妯℃澘淇℃伅淇℃伅 + * + * @param id 鐢虫姤妯℃澘淇℃伅涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsTemplateInfoById(Long id) { + return baseMapper.deleteBmsTemplateInfoById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateRecordServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateRecordServiceImpl.java new file mode 100644 index 0000000..082b525 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateRecordServiceImpl.java @@ -0,0 +1,157 @@ +package com.ruoyi.jjh.declaration.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory; +import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord; +import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateQueryDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordAddDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordQueryDto; +import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordUpdateDto; +import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordQueryVo; +import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordVo; +import com.ruoyi.jjh.declaration.mapper.BmsTemplateRecordMapper; +import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService; +import com.ruoyi.jjh.declaration.service.IBmsEnterpriseDirectoryService; +import com.ruoyi.jjh.declaration.service.IBmsTemplateRecordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 鍦ㄧ嚎妯℃澘Service涓氬姟灞傚鐞 + * + * @author farben + * @date 2023-09-07 + */ +@Service +public class BmsTemplateRecordServiceImpl extends ServiceImpl implements IBmsTemplateRecordService { + + @Autowired + private IBmsEnterpriseDirectoryService enterpriseDirectoryService; + + @Autowired + private IBmsEnterpriseBasicInfoService iBmsEnterpriseBasicInfoService; + /** + * 鏌ヨ鍦ㄧ嚎妯℃澘 + * + * @param id 鍦ㄧ嚎妯℃澘涓婚敭 + * @return 鍦ㄧ嚎妯℃澘 + */ + @Override + public BmsTemplateRecordVo selectBmsTemplateRecordById(Long id) { + BmsTemplateRecordVo bmsTemplateRecordVo = baseMapper.selectBmsTemplateRecordVoById(id); + List list = enterpriseDirectoryService.lambdaQuery() + .eq(BmsEnterpriseDirectory::getTemplateRecordId, id).list(); + bmsTemplateRecordVo.setEnterpriseDirectoryList(list); + return bmsTemplateRecordVo; + } + + /** + * 鏌ヨ鍦ㄧ嚎妯℃澘鍒楄〃 + * + * @param bmsTemplateRecordQueryDto 鍦ㄧ嚎妯℃澘 + * @return 鍦ㄧ嚎妯℃澘 + */ + @Override + public List selectBmsTemplateRecordList(BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto) { + return baseMapper.selectTemplateRecordVo(bmsTemplateRecordQueryDto); + } + + @Override + public List selectTemplateRecordList(String creditCode) { + return baseMapper.selectTemplateRecordList(creditCode); + } + + @Override + public List selectBmsTemplateNameList(BmsTemplateQueryDto bmsTemplateQueryDto) { + Long enterpriseId = bmsTemplateQueryDto.getEnterpriseId(); + BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo = iBmsEnterpriseBasicInfoService.selectBmsEnterpriseBasicInfoById(enterpriseId); + if (BeanUtil.isNotEmpty(bmsEnterpriseBasicInfo)){ + bmsTemplateQueryDto.setCreditCode(bmsEnterpriseBasicInfo.getCreditCode()); + return baseMapper.selectBmsTemplateNameList(bmsTemplateQueryDto); + } + return null; + } + + /** + * 鏂板鍦ㄧ嚎妯℃澘 + * + * @param bmsTemplateRecordAddDto 鍦ㄧ嚎妯℃澘 + * @return 缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int insertBmsTemplateRecord(BmsTemplateRecordAddDto bmsTemplateRecordAddDto) { + int num = 0; + try { + bmsTemplateRecordAddDto.setCreateTime(DateUtils.getNowDate()); + num = baseMapper.insertBmsTemplateRecord(bmsTemplateRecordAddDto); + List enterpriseDirectoryList = bmsTemplateRecordAddDto + .getEnterpriseDirectoryList(); + if (null != enterpriseDirectoryList && enterpriseDirectoryList.size()>0){ + enterpriseDirectoryList.forEach(x->{ + x.setTemplateRecordId(bmsTemplateRecordAddDto.getId()); + }); + enterpriseDirectoryService.saveOrUpdateBatch(enterpriseDirectoryList); + } + }catch (Exception e){ + e.printStackTrace(); + } + return num; + } + + /** + * 淇敼鍦ㄧ嚎妯℃澘 + * + * @param bmsTemplateRecordUpdateDto 鍦ㄧ嚎妯℃澘 + * @return 缁撴灉 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int updateBmsTemplateRecord(BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto) { + bmsTemplateRecordUpdateDto.setUpdateTime(DateUtils.getNowDate()); + int num = baseMapper.updateBmsTemplateRecord(bmsTemplateRecordUpdateDto); + // 鍒犻櫎浼佷笟鐩稿叧鍒楄〃 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("template_record_id",bmsTemplateRecordUpdateDto.getId()); + enterpriseDirectoryService.remove(queryWrapper); + // 鏂板浼佷笟鐩稿叧鍒楄〃 + List enterpriseDirectoryList = bmsTemplateRecordUpdateDto + .getEnterpriseDirectoryList(); + if (null != enterpriseDirectoryList && enterpriseDirectoryList.size()>0){ + enterpriseDirectoryList.forEach(x->{ + x.setTemplateRecordId(bmsTemplateRecordUpdateDto.getId()); + }); + enterpriseDirectoryService.saveOrUpdateBatch(enterpriseDirectoryList); + } + return num; + } + + /** + * 鎵归噺鍒犻櫎鍦ㄧ嚎妯℃澘 + * + * @param ids 闇瑕佸垹闄ょ殑鍦ㄧ嚎妯℃澘涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsTemplateRecordByIds(Long[] ids) { + return baseMapper.deleteBmsTemplateRecordByIds(ids); + } + + /** + * 鍒犻櫎鍦ㄧ嚎妯℃澘淇℃伅 + * + * @param id 鍦ㄧ嚎妯℃澘涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBmsTemplateRecordById(Long id) { + return baseMapper.deleteBmsTemplateRecordById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BsmFundingInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BsmFundingInfoServiceImpl.java new file mode 100644 index 0000000..a674288 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BsmFundingInfoServiceImpl.java @@ -0,0 +1,88 @@ +package com.ruoyi.jjh.declaration.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.jjh.declaration.entity.BsmFundingInfo; +import com.ruoyi.jjh.declaration.mapper.BsmFundingInfoMapper; +import com.ruoyi.jjh.declaration.service.IBsmFundingInfoService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 璧勯噾淇℃伅Service涓氬姟灞傚鐞 + * + * @author farben + * @date 2023-08-25 + */ +@Service +public class BsmFundingInfoServiceImpl extends ServiceImpl implements IBsmFundingInfoService { + + /** + * 鏌ヨ璧勯噾淇℃伅 + * + * @param id 璧勯噾淇℃伅涓婚敭 + * @return 璧勯噾淇℃伅 + */ + @Override + public BsmFundingInfo selectBsmFundingInfoById(Long id) { + return baseMapper.selectBsmFundingInfoById(id); + } + + /** + * 鏌ヨ璧勯噾淇℃伅鍒楄〃 + * + * @param bsmFundingInfo 璧勯噾淇℃伅 + * @return 璧勯噾淇℃伅 + */ + @Override + public List selectBsmFundingInfoList(BsmFundingInfo bsmFundingInfo) { + return baseMapper.selectBsmFundingInfoList(bsmFundingInfo); + } + + /** + * 鏂板璧勯噾淇℃伅 + * + * @param bsmFundingInfo 璧勯噾淇℃伅 + * @return 缁撴灉 + */ + @Override + public int insertBsmFundingInfo(BsmFundingInfo bsmFundingInfo) { + bsmFundingInfo.setCreateTime(DateUtils.getNowDate()); + return baseMapper.insertBsmFundingInfo(bsmFundingInfo); + } + + /** + * 淇敼璧勯噾淇℃伅 + * + * @param bsmFundingInfo 璧勯噾淇℃伅 + * @return 缁撴灉 + */ + @Override + public int updateBsmFundingInfo(BsmFundingInfo bsmFundingInfo) { + bsmFundingInfo.setUpdateTime(DateUtils.getNowDate()); + return baseMapper.updateBsmFundingInfo(bsmFundingInfo); + } + + /** + * 鎵归噺鍒犻櫎璧勯噾淇℃伅 + * + * @param ids 闇瑕佸垹闄ょ殑璧勯噾淇℃伅涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBsmFundingInfoByIds(Long[] ids) { + return baseMapper.deleteBsmFundingInfoByIds(ids); + } + + /** + * 鍒犻櫎璧勯噾淇℃伅淇℃伅 + * + * @param id 璧勯噾淇℃伅涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteBsmFundingInfoById(Long id) { + return baseMapper.deleteBsmFundingInfoById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/CommonServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/CommonServiceImpl.java new file mode 100644 index 0000000..617cd58 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/CommonServiceImpl.java @@ -0,0 +1,413 @@ +package com.ruoyi.jjh.declaration.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.common.context.SecurityContextHolder; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.jjh.declaration.entity.BmsApprovalInfo; +import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory; +import com.ruoyi.jjh.declaration.entity.BmsFundingDetail; +import com.ruoyi.jjh.declaration.entity.BmsProcessInfo; +import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord; +import com.ruoyi.jjh.declaration.entity.dto.BmsApprovalInfoUpdateDto; +import com.ruoyi.jjh.declaration.entity.dto.OpenInterfaceApplyAddDto; +import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo; +import com.ruoyi.jjh.declaration.entity.vo.BmsProjectSettlementAwardQueryVo; +import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo; +import com.ruoyi.jjh.declaration.service.IBmsApprovalInfoService; +import com.ruoyi.jjh.declaration.service.IBmsBigStrongAwardService; +import com.ruoyi.jjh.declaration.service.IBmsBrandingAwardService; +import com.ruoyi.jjh.declaration.service.IBmsCarrierConstructionAwardService; +import com.ruoyi.jjh.declaration.service.IBmsCreditManagementService; +import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; +import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService; +import com.ruoyi.jjh.declaration.service.IBmsEnterpriseDirectoryService; +import com.ruoyi.jjh.declaration.service.IBmsFundingDetailService; +import com.ruoyi.jjh.declaration.service.IBmsIndustrialInternetAwardService; +import com.ruoyi.jjh.declaration.service.IBmsIntegrationIndustriesService; +import com.ruoyi.jjh.declaration.service.IBmsLogisticsDevelopmentAwardService; +import com.ruoyi.jjh.declaration.service.IBmsManufacturingServicesAwardService; +import com.ruoyi.jjh.declaration.service.IBmsPlatformConstructionAwardService; +import com.ruoyi.jjh.declaration.service.IBmsProcessInfoService; +import com.ruoyi.jjh.declaration.service.IBmsProjectSettlementAwardService; +import com.ruoyi.jjh.declaration.service.IBmsSceneOpeningAwardService; +import com.ruoyi.jjh.declaration.service.IBmsTemplateRecordService; +import com.ruoyi.jjh.declaration.service.ICommonService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +/** + *

+ * 鍏叡鏈嶅姟impl + *

+ * + * @className: CommonServiceImpl + * @author: emiya.xie + * @create: 2023-08-31 15:44 + */ +@Service +@Lazy +public class CommonServiceImpl implements ICommonService { + + + @Autowired + private IBmsProcessInfoService iBmsProcessInfoService; + + @Autowired + private IBmsApprovalInfoService iBmsApprovalInfoService; + + @Autowired + private IBmsEnterpriseBasicInfoService bmsEnterpriseBasicInfoService; + + @Autowired + private IBmsEnterpriseDirectoryService bmsEnterpriseDirectoryService; + + @Autowired + private IBmsProjectSettlementAwardService iBmsProjectSettlementAwardService; + + @Autowired + private IBmsBigStrongAwardService iBmsBigStrongAwardService; + + @Autowired + private IBmsCarrierConstructionAwardService iBmsCarrierConstructionAwardService; + + @Autowired + private IBmsPlatformConstructionAwardService iBmsPlatformConstructionAwardService; + + @Autowired + private IBmsBrandingAwardService iBmsBrandingAwardService; + + @Autowired + private IBmsSceneOpeningAwardService iBmsSceneOpeningAwardService; + + @Autowired + private IBmsCreditManagementService iBmsCreditManagementService; + + @Autowired + private IBmsIndustrialInternetAwardService iBmsIndustrialInternetAwardService; + + @Autowired + private IBmsManufacturingServicesAwardService iBmsManufacturingServicesAwardService; + + @Autowired + private IBmsLogisticsDevelopmentAwardService iBmsLogisticsDevelopmentAwardService; + + @Autowired + private IBmsIntegrationIndustriesService iBmsIntegrationIndustriesService; + + @Autowired + private IBmsFundingDetailService iBmsFundingDetailService; + + @Autowired + private IBmsTemplateRecordService iBmsTemplateRecordService; + + @Autowired + private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; + + + /** + * 妫娴嬩紒涓氫俊鎭 + * + * @param creditCode 浼佷笟缁熶竴淇$敤浠g爜 + * @param templateRecordId 妯℃澘 + * @return + * @author emiya.xie + * @create 2023/8/31 15:48 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Long checkEnterprise(String creditCode, int templateRecordId) { + Long enterpriseId = 0L; + BmsEnterpriseBasicInfo basicInfo = bmsEnterpriseBasicInfoService.getOne(Wrappers.lambdaQuery(BmsEnterpriseBasicInfo.class).eq(BmsEnterpriseBasicInfo::getCreditCode, creditCode)); + if (BeanUtil.isEmpty(basicInfo)) { + throw new ServiceException("鐢宠浼佷笟鏈叆浼佷笟搴擄紒"); + } + enterpriseId = basicInfo.getId(); + BmsEnterpriseDirectory enterpriseDirectory = bmsEnterpriseDirectoryService.getOne(Wrappers.lambdaQuery(BmsEnterpriseDirectory.class).eq(BmsEnterpriseDirectory::getCreditCode, creditCode).eq(BmsEnterpriseDirectory::getTemplateRecordId, templateRecordId)); + if (BeanUtil.isEmpty(enterpriseDirectory)) { + throw new ServiceException("鐢宠浼佷笟涓嶅湪浼佷笟鍚嶅綍涓紒"); + } + return enterpriseId; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void checkDeclaration(String creditCode, int templateRecordId) { + // check褰撳墠浼佷笟鏄惁宸茬粡鐢宠 + BmsEnterpriseBasicInfo enterpriseInfo = bmsEnterpriseBasicInfoService.getOne(Wrappers.lambdaQuery(BmsEnterpriseBasicInfo.class).eq(BmsEnterpriseBasicInfo::getCreditCode, creditCode)); + // check 鐢宠鏄惁杩囨湡 + BmsTemplateRecord templateRecord = iBmsTemplateRecordService.lambdaQuery().eq(BmsTemplateRecord::getId, templateRecordId).le(BmsTemplateRecord::getStartTime, LocalDate.now()).ge(BmsTemplateRecord::getEndTime, LocalDate.now()).one(); + if (BeanUtil.isEmpty(templateRecord)) { + throw new ServiceException("璇ョ敵璇峰凡缁忛敊杩囨椂闂"); + } + List list = iBmsDeclarationRecordsService.lambdaQuery().eq(BmsDeclarationRecords::getEnterpriseId, enterpriseInfo.getId()).eq(BmsDeclarationRecords::getTemplateRecordId, templateRecord.getId()).list(); + if (CollectionUtil.isNotEmpty(list)) { + throw new ServiceException("璇ヤ紒涓氬凡缁忕敵璇凤紝璇峰嬁閲嶅鐢宠锛"); + } + + } + + /** + * 妫娴嬩紒涓氫俊鎭 + * + * @param enterpriseId 浼佷笟id + * @param templateId 妯℃澘id + * @return {@link Boolean} + * @author emiya.xie + * @create 2023/9/4 22:55 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void checkEnterprise(Long enterpriseId, Long templateId) { + try { + BmsEnterpriseBasicInfo basicInfo = bmsEnterpriseBasicInfoService.getOne(Wrappers.lambdaQuery(BmsEnterpriseBasicInfo.class).eq(BmsEnterpriseBasicInfo::getId, enterpriseId)); + if (BeanUtil.isEmpty(basicInfo)) { + throw new ServiceException("鐢宠浼佷笟鏈叆浼佷笟搴擄紒"); + } + BmsEnterpriseDirectory enterpriseDirectory = bmsEnterpriseDirectoryService.getOne(Wrappers.lambdaQuery(BmsEnterpriseDirectory.class).eq(BmsEnterpriseDirectory::getCreditCode, basicInfo.getCreditCode()).eq(BmsEnterpriseDirectory::getTemplateRecordId, templateId)); + if (BeanUtil.isEmpty(enterpriseDirectory)) { + throw new ServiceException("鐢宠浼佷笟涓嶅湪浼佷笟鍚嶅綍涓紒"); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 鑾峰彇鐢宠璁板綍璇︽儏 + * + * @param declarationTemplateType 妯℃澘id + * @param detailId 璇︽儏id + * @param declarationRecordsVo + * @return + * @author emiya.xie + * @create 2023/9/5 15:55 + */ + @Override + public void getData(int declarationTemplateType, Long detailId, DeclarationRecordsVo declarationRecordsVo) { + // 鏍规嵁妯℃澘id鏌ヨ瀵瑰簲鏁版嵁 + if (declarationTemplateType == 1) { + // 椤圭洰钀芥埛濂栬ˉ + BmsProjectSettlementAwardQueryVo settlementAwardQueryVo = iBmsProjectSettlementAwardService.selectBmsProjectSettlementAwardById(detailId); + List list = iBmsFundingDetailService.lambdaQuery().eq(BmsFundingDetail::getDetailId, settlementAwardQueryVo.getId()).list(); + settlementAwardQueryVo.setFundingDetailList(list); + declarationRecordsVo.setBmsProjectSettlementAwardQueryVo(settlementAwardQueryVo); + } else if (declarationTemplateType == 2) { + // 鍋氬ぇ鍋氬己濂栬ˉ + BmsBigStrongAwardQueryVo bmsBigStrongAwardQueryVo = iBmsBigStrongAwardService.selectBmsBigStrongAwardById(detailId); + List list = iBmsFundingDetailService.lambdaQuery().eq(BmsFundingDetail::getDetailId, bmsBigStrongAwardQueryVo.getId()).list(); + bmsBigStrongAwardQueryVo.setFundingDetailList(list); + declarationRecordsVo.setBmsBigStrongAwardQueryVo(bmsBigStrongAwardQueryVo); + } else if (declarationTemplateType == 3) { + // 杞戒綋寤鸿濂栬ˉ + declarationRecordsVo.setBmsCarrierConstructionAward(iBmsCarrierConstructionAwardService.selectBmsCarrierConstructionAwardById(detailId)); + } else if (declarationTemplateType == 4) { + // 骞冲彴寤鸿濂栬ˉ + declarationRecordsVo.setBmsPlatformConstructionAward(iBmsPlatformConstructionAwardService.selectBmsPlatformConstructionAwardById(detailId)); + } else if (declarationTemplateType == 5) { + // 鍝佺墝鎵撻犲琛 + declarationRecordsVo.setBmsBrandingAward(iBmsBrandingAwardService.selectBmsBrandingAwardById(detailId)); + } else if (declarationTemplateType == 6) { + // 鍦烘櫙寮鏀惧琛 + declarationRecordsVo.setBmsSceneOpeningAward(iBmsSceneOpeningAwardService.selectBmsSceneOpeningAwardById(detailId)); + } else if (declarationTemplateType == 7) { + // 淇$敤绠$悊濂栬ˉ + declarationRecordsVo.setBmsCreditManagement(iBmsCreditManagementService.selectBmsCreditManagementById(detailId)); + } else if (declarationTemplateType == 8) { + // 5G+宸ヤ笟浜掕仈缃戝琛 + declarationRecordsVo.setBmsIndustrialInternetAward(iBmsIndustrialInternetAwardService.selectBmsIndustrialInternetAwardById(detailId)); + } else if (declarationTemplateType == 9) { + // 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + declarationRecordsVo.setBmsManufacturingServicesAward(iBmsManufacturingServicesAwardService.selectBmsManufacturingServicesAwardById(detailId)); + } else if (declarationTemplateType == 10) { + // 鐗╂祦鍙戝睍濂栬ˉ + declarationRecordsVo.setBmsLogisticsDevelopmentAward(iBmsLogisticsDevelopmentAwardService.selectBmsLogisticsDevelopmentAwardById(detailId)); + } else if (declarationTemplateType == 11) { + // 涓や笟铻嶅悎濂栬ˉ + declarationRecordsVo.setBmsIntegrationIndustries(iBmsIntegrationIndustriesService.selectBmsIntegrationIndustriesById(detailId)); + } + } + + /** + * 鐢熸垚瀹℃壒淇℃伅 + * + * @param declarationRecordId + * @param approvalType + * @return + * @author emiya.xie + * @create 2023/9/9 16:44 + */ + @Override + public void insertProcessInfo(Long declarationRecordId, Integer approvalType) { + // 鑾峰彇娴佺▼淇℃伅 + List processInfoList = iBmsProcessInfoService.lambdaQuery().eq(BmsProcessInfo::getApprovalType, approvalType).list(); + if (CollectionUtil.isNotEmpty(processInfoList)) { + List approvalList = new ArrayList<>(); + processInfoList.forEach(x -> { + BmsApprovalInfo approvalInfo = new BmsApprovalInfo(); + approvalInfo.setProcessId(x.getId()); + approvalInfo.setDeclarationRecordsId(declarationRecordId); + approvalInfo.setApprovalStatus(0); + approvalInfo.setApprovalById(x.getApprovalById()); + approvalInfo.setSort(x.getSort()); + if (x.getSort() == 1) { + approvalInfo.setIsReview(0); + } + approvalList.add(approvalInfo); + }); + iBmsApprovalInfoService.saveOrUpdateBatch(approvalList); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void insertAuditRecord(Long declarationRecordId, Integer approvalType) { + // 鑾峰彇娴佺▼淇℃伅 + List processInfoList = iBmsProcessInfoService.lambdaQuery().eq(BmsProcessInfo::getApprovalType, approvalType).list(); + + List list = new ArrayList(); + list = iBmsApprovalInfoService.lambdaQuery().eq(BmsApprovalInfo::getDeclarationRecordsId, declarationRecordId).list(); + if (CollectionUtil.isNotEmpty(processInfoList)) { + List finalList = list; + processInfoList.forEach(x -> { + if (x.getSort() == 1) { + addApprovalInfo(declarationRecordId, x.getApprovalById(), x.getId(), finalList.size() + 1); + } +// if (x.getApprovalById().equals(SecurityContextHolder.getUserId())){ +// addApprovalInfo(declarationRecordId,x.getApprovalById(),x.getId(),list.size()); +// } + }); + } + } + + /** + * 鏂板瀹℃壒璁板綍 + * + * @param declarationRecordId + * @param approvalById + * @param processId + * @param sort + * @return + * @author emiya.xie + * @create 2023/9/14 14:50 + */ + public void addApprovalInfo(Long declarationRecordId, Long approvalById, Long processId, Integer sort) { + BmsApprovalInfo approvalInfo = new BmsApprovalInfo(); + approvalInfo.setProcessId(processId); + approvalInfo.setDeclarationRecordsId(declarationRecordId); + approvalInfo.setApprovalStatus(0); + approvalInfo.setApprovalById(approvalById); + approvalInfo.setSort(sort); + approvalInfo.setIsReview(0); + iBmsApprovalInfoService.save(approvalInfo); + } + + /** + * 娓呯┖瀹℃壒娴佺▼ + * + * @param declarationRecordId + * @return + * @author emiya.xie + * @create 2023/9/11 10:30 + */ + @Override + public void cleanProcessList(Long declarationRecordId) { + // 鑾峰彇娴佺▼淇℃伅 + List list = iBmsApprovalInfoService.lambdaQuery().eq(BmsApprovalInfo::getDeclarationRecordsId, declarationRecordId).list(); + if (CollectionUtil.isNotEmpty(list)) { + list.forEach(x -> { + x.setApprovalStatus(0); + x.setApprovalOpinions(null); + x.setApprovalAttachment(null); + x.setApprovalTime(null); + if (x.getSort() == 1) { + x.setIsReview(0); + } else { + x.setIsReview(1); + } + }); + iBmsApprovalInfoService.saveOrUpdateBatch(list); + } + } + + @Override + public List getUserIds(Long userId) { + + return null; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int updateBmsApprovalInfo(BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto) { + Boolean flag = false; + List approvalInfoList = iBmsApprovalInfoService.lambdaQuery().eq(BmsApprovalInfo::getDeclarationRecordsId, bmsApprovalInfoUpdateDto.getDeclarationRecordsId()).orderByAsc(BmsApprovalInfo::getSort).list(); + if (CollectionUtil.isNotEmpty(approvalInfoList)) { + approvalInfoList.forEach(x -> { + if (x.getId().equals(bmsApprovalInfoUpdateDto.getId())) { + BeanUtil.copyProperties(bmsApprovalInfoUpdateDto, x); + x.setApprovalById(SecurityContextHolder.getUserId()); + } + if ((bmsApprovalInfoUpdateDto.getSort() + 1) == x.getIsReview()) { + x.setIsReview(0); + } + }); + flag = iBmsApprovalInfoService.saveOrUpdateBatch(approvalInfoList); + } + if (!flag) { + return 0; + } + return 1; + } + + @Override + public int insertOpenInterfaceApplyAddDto(OpenInterfaceApplyAddDto openInterfaceApplyAddDto) { + int num = 0; + // 鏍规嵁妯℃澘id鏌ヨ瀵瑰簲鏁版嵁 + if (openInterfaceApplyAddDto.getDeclarationTemplateType() == 1) { + // 椤圭洰钀芥埛濂栬ˉ + num = iBmsProjectSettlementAwardService.insertBmsProjectSettlementAward(openInterfaceApplyAddDto.getBmsProjectSettlementAwardAddDto()); + } else if (openInterfaceApplyAddDto.getDeclarationTemplateType() == 2) { + // 鍋氬ぇ鍋氬己濂栬ˉ + num = iBmsBigStrongAwardService.insertBmsBigStrongAward(openInterfaceApplyAddDto.getBmsBigStrongAwardAddDto()); + } else if (openInterfaceApplyAddDto.getDeclarationTemplateType() == 3) { + // 杞戒綋寤鸿濂栬ˉ + num = iBmsCarrierConstructionAwardService.insertBmsCarrierConstructionAward(openInterfaceApplyAddDto.getBmsCarrierConstructionAwardAddDto()); + } else if (openInterfaceApplyAddDto.getDeclarationTemplateType() == 4) { + // 骞冲彴寤鸿濂栬ˉ + num = iBmsPlatformConstructionAwardService.insertBmsPlatformConstructionAward(openInterfaceApplyAddDto.getBmsPlatformConstructionAwardAddDto()); + } else if (openInterfaceApplyAddDto.getDeclarationTemplateType() == 5) { + // 鍝佺墝鎵撻犲琛 + num = iBmsBrandingAwardService.insertBmsBrandingAward(openInterfaceApplyAddDto.getBmsBrandingAwardAddDto()); + } else if (openInterfaceApplyAddDto.getDeclarationTemplateType() == 6) { + // 鍦烘櫙寮鏀惧琛 + num = iBmsSceneOpeningAwardService.insertBmsSceneOpeningAward(openInterfaceApplyAddDto.getBmsSceneOpeningAwardAddDto()); + } else if (openInterfaceApplyAddDto.getDeclarationTemplateType() == 7) { + // 淇$敤绠$悊濂栬ˉ + num = iBmsCreditManagementService.insertBmsCreditManagement(openInterfaceApplyAddDto.getBmsCreditManagementAddDto()); + } else if (openInterfaceApplyAddDto.getDeclarationTemplateType() == 8) { + // 5G+宸ヤ笟浜掕仈缃戝琛 + num = iBmsIndustrialInternetAwardService.insertBmsIndustrialInternetAward(openInterfaceApplyAddDto.getBmsIndustrialInternetAwardAddDto()); + } else if (openInterfaceApplyAddDto.getDeclarationTemplateType() == 9) { + // 鍒堕犳湇鍔′笟鏈夋晥鎶曞叆濂栬ˉ + num = iBmsManufacturingServicesAwardService.insertBmsManufacturingServicesAward(openInterfaceApplyAddDto.getBmsManufacturingServicesAwardAddDto()); + } else if (openInterfaceApplyAddDto.getDeclarationTemplateType() == 10) { + // 鐗╂祦鍙戝睍濂栬ˉ + num = iBmsLogisticsDevelopmentAwardService.insertBmsLogisticsDevelopmentAward(openInterfaceApplyAddDto.getBmsLogisticsDevelopmentAwardAddDto()); + } else if (openInterfaceApplyAddDto.getDeclarationTemplateType() == 11) { + // 涓や笟铻嶅悎濂栬ˉ + num = iBmsIntegrationIndustriesService.insertBmsIntegrationIndustries(openInterfaceApplyAddDto.getBmsIntegrationIndustriesAddDto()); + } + return num; + } + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/OpenInterfaceServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/OpenInterfaceServiceImpl.java new file mode 100644 index 0000000..e89c8ec --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/OpenInterfaceServiceImpl.java @@ -0,0 +1,101 @@ +package com.ruoyi.jjh.declaration.service.impl; + +import cn.hutool.core.collection.CollectionUtil; +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory; +import com.ruoyi.jjh.declaration.entity.BmsProjectInfo; +import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord; +import com.ruoyi.jjh.declaration.entity.dto.OpenInterfaceApplyAddDto; +import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordQueryVo; +import com.ruoyi.jjh.declaration.entity.vo.EnterpriseInfoTemplateVo; +import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService; +import com.ruoyi.jjh.declaration.service.IBmsEnterpriseDirectoryService; +import com.ruoyi.jjh.declaration.service.IBmsProjectInfoService; +import com.ruoyi.jjh.declaration.service.IBmsProjectSettlementAwardService; +import com.ruoyi.jjh.declaration.service.IBmsTemplateRecordService; +import com.ruoyi.jjh.declaration.service.ICommonService; +import com.ruoyi.jjh.declaration.service.IOpenInterfaceService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/** + *

+ * 寮鏀炬帴鍙mpl + *

+ * + * @className: OpenInterfaceServiceImpl + * @author: emiya.xie + * @create: 2023-09-12 10:13 + */ +@Service +public class OpenInterfaceServiceImpl implements IOpenInterfaceService { + + @Autowired + private ICommonService iCommonService; + + @Autowired + private IBmsEnterpriseBasicInfoService iBmsEnterpriseBasicInfoService; + + @Autowired + private IBmsEnterpriseDirectoryService iBmsEnterpriseDirectoryService; + + @Autowired + private IBmsTemplateRecordService iBmsTemplateRecordService; + + @Autowired + private IBmsProjectInfoService iBmsProjectInfoService; + + @Autowired + private IBmsProjectSettlementAwardService iBmsProjectSettlementAwardService; + + + @Override + public EnterpriseInfoTemplateVo enterpriseList(String creditCode) { + EnterpriseInfoTemplateVo enterpriseInfoTemplateVo = new EnterpriseInfoTemplateVo(); + // 鑾峰彇浼佷笟淇℃伅 + List enterpriseList = iBmsEnterpriseBasicInfoService.lambdaQuery() + .like(BmsEnterpriseBasicInfo::getCreditCode, creditCode).list(); + List directoryList = new ArrayList<>(); + List templateRecordList = new ArrayList<>(); + if (CollectionUtil.isNotEmpty(enterpriseList)) { + // 浼佷笟淇℃伅涓嶄负绌猴紝鑾峰彇浼佷笟鍚嶅綍淇℃伅 + enterpriseInfoTemplateVo.setEnterpriseBasicList(enterpriseList); + List creditCodeList = enterpriseList.stream().map(BmsEnterpriseBasicInfo::getCreditCode).collect(Collectors.toList()); + // 浼佷笟鍚嶅綍鍒楄〃 + directoryList = iBmsEnterpriseDirectoryService.lambdaQuery().in(BmsEnterpriseDirectory::getCreditCode, creditCodeList).list(); + System.out.println(directoryList); + } + if (CollectionUtil.isNotEmpty(directoryList)) { + List templateRecordIdList = directoryList.stream().map(BmsEnterpriseDirectory::getTemplateRecordId).distinct() + .collect(Collectors.toList()); + templateRecordList = iBmsTemplateRecordService.lambdaQuery().in(BmsTemplateRecord::getId, templateRecordIdList) + .eq(BmsTemplateRecord::getRoad, 1L).list(); + } + List bmsTemplateRecordQueryVos = iBmsTemplateRecordService + .selectTemplateRecordList(creditCode); + enterpriseInfoTemplateVo.setTemplateRecordList(bmsTemplateRecordQueryVos); + return enterpriseInfoTemplateVo; + } + + /** + * 鏂板鐢虫姤璁板綍 + * + * @param openInterfaceApplyAddDto + * @return {@link int} + * @author emiya.xie + * @create 2023/9/12 14:54 + */ + @Override + public int insertOpenInterfaceApplyAddDto(OpenInterfaceApplyAddDto openInterfaceApplyAddDto) { + return iCommonService.insertOpenInterfaceApplyAddDto(openInterfaceApplyAddDto); + } + + @Override + public BmsProjectInfo getProjectInfo(Long templateRecordId) { + return iBmsProjectInfoService.getProjectInfo(templateRecordId); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JMemorandumController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JMemorandumController.java index bc8b999..b951325 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JMemorandumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JMemorandumController.java @@ -10,12 +10,19 @@ import com.ruoyi.jjh.ent.entity.request.JMemorandumRequest; import com.ruoyi.jjh.ent.service.JMemorandumService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +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.RestController; import javax.annotation.Resource; import java.io.Serializable; import java.util.Date; -import java.util.List; /** * 澶囧繕褰(JMemorandum)琛ㄦ帶鍒跺眰 @@ -36,14 +43,14 @@ public class JMemorandumController extends BaseController { /** * 鍒嗛〉鏌ヨ鎵鏈夋暟鎹 * - * @param page 鍒嗛〉瀵硅薄 + * @param page 鍒嗛〉瀵硅薄 * @param jMemorandumRequest 鏌ヨ瀹炰綋 * @return 鎵鏈夋暟鎹 */ @ApiOperation(value = "鍒嗛〉鏌ヨ鎵鏈夋暟鎹", response = JMemorandum.class) @GetMapping public AjaxResult selectAll(Page page, JMemorandumRequest jMemorandumRequest) { - return success(jMemorandumService.page(page,jMemorandumRequest)); + return success(jMemorandumService.page(page, jMemorandumRequest)); } /** @@ -55,7 +62,7 @@ public class JMemorandumController extends BaseController { @ApiOperation(value = "鏍规嵁鍏宠仈椤圭洰搴揑D鏌ヨ璇D涓嬬殑澶囧繕褰", response = JMemorandum.class) @GetMapping("/getIdToList") public AjaxResult selectIdToAll(JMemorandumRequest jMemorandumRequest) { - if(jMemorandumRequest.getProjectId() == null){ + if (jMemorandumRequest.getProjectId() == null) { throw new ServiceException("椤圭洰搴揑D涓嶈兘涓虹┖"); } return success(jMemorandumService.selectIdToAll(jMemorandumRequest)); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java index 5d67792..c2ece79 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java @@ -4,9 +4,7 @@ package com.ruoyi.jjh.ent.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ProjectExcelUtil; import com.ruoyi.common.utils.poi.ProjectValueUtil; @@ -17,11 +15,19 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +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.RequestPart; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.Serializable; import java.util.List; @@ -52,7 +58,7 @@ public class JProjectController extends BaseController { @ApiOperation(value = "鍒嗛〉鏌ヨ椤圭洰", response = JProject.class) @GetMapping public AjaxResult selectAll(Page page, JProject jProject) { - return success(jProjectService.page(page,jProject)); + return success(jProjectService.page(page, jProject)); } /** @@ -105,17 +111,16 @@ public class JProjectController extends BaseController { /** * 瀵煎叆宸叉湁鐨別xcel椤圭洰鏁版嵁 - * */ @ApiOperation(value = "瀵煎叆宸叉湁鐨別xcel椤圭洰鏁版嵁") - @PostMapping(value = "/export",consumes ="multipart/form-data") + @PostMapping(value = "/export", consumes = "multipart/form-data") public AjaxResult export(@RequestPart("file") MultipartFile file) throws Exception { ProjectExcelUtil util = new ProjectExcelUtil<>(JProject.class); List proList = util.importExcel(file.getInputStream()); StringBuilder successMsg = new StringBuilder(); - if(proList == null && proList.isEmpty()){ + if (proList == null && proList.isEmpty()) { throw new ServiceException("椤圭洰瀵煎叆鏁版嵁涓嶈兘涓虹┖"); - }else { + } else { jProjectService.saveBatch(proList); successMsg.append("瀵煎叆鎴愬姛"); } @@ -124,23 +129,22 @@ public class JProjectController extends BaseController { /** * 瀵煎叆涓嬭浇鐨別xcel妯℃澘鍜屽弬鏁伴」鐩暟鎹 - * */ @ApiOperation(value = "瀵煎叆涓嬭浇鐨別xcel妯℃澘鍜屽弬鏁伴」鐩暟鎹") @ApiImplicitParams({ - @ApiImplicitParam(name="projectClassify",value="椤圭洰鍒嗙被",required=true), - @ApiImplicitParam(name="projectYear",value="骞翠唤",required=true), + @ApiImplicitParam(name = "projectClassify", value = "椤圭洰鍒嗙被", required = true), + @ApiImplicitParam(name = "projectYear", value = "骞翠唤", required = true), }) - @PostMapping(value = "/importTemplateProject",consumes ="multipart/form-data") + @PostMapping(value = "/importTemplateProject", consumes = "multipart/form-data") public AjaxResult importTemplateProject(@RequestPart("file") MultipartFile file, - @RequestParam("projectClassify")String projectClassify + @RequestParam("projectClassify") String projectClassify ) throws Exception { ProjectValueUtil util = new ProjectValueUtil<>(JProject.class); - List proList = util.importExcel(file.getInputStream(),projectClassify); + List proList = util.importExcel(file.getInputStream(), projectClassify); StringBuilder successMsg = new StringBuilder(); - if(proList == null && proList.isEmpty()){ + if (proList == null && proList.isEmpty()) { throw new ServiceException("椤圭洰瀵煎叆鏁版嵁涓嶈兘涓虹┖"); - }else { + } else { jProjectService.saveBatch(proList); successMsg.append("瀵煎叆鎴愬姛"); } @@ -149,12 +153,10 @@ public class JProjectController extends BaseController { /** * 涓嬭浇椤圭洰妯℃澘 - * */ @ApiOperation(value = "涓嬭浇椤圭洰妯℃澘") @PostMapping("/updateProjectTemplate") - public void updateProjectTemplate(HttpServletResponse response) - { + public void updateProjectTemplate(HttpServletResponse response) { ExcelUtil util = new ExcelUtil<>(JProjectExcel.class); util.importTemplateExcel(response, "椤圭洰妯℃澘"); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java index 789381f..e7cba8f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java @@ -1,23 +1,5 @@ package com.ruoyi.web.controller.common; -import java.io.File; -import java.io.FileInputStream; -import java.util.ArrayList; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.jjh.ent.entity.JMemorandum; -import com.ruoyi.jjh.ent.entity.request.JProjectExcel; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.AjaxResult; @@ -25,38 +7,48 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.file.FileUploadUtils; import com.ruoyi.common.utils.file.FileUtils; import com.ruoyi.framework.config.ServerConfig; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.List; /** * 閫氱敤璇锋眰澶勭悊 - * + * * @author ruoyi */ @RestController @Api(tags = "涓婁紶涓嬭浇") @RequestMapping("/common") -public class CommonController -{ +public class CommonController { private static final Logger log = LoggerFactory.getLogger(CommonController.class); - + private static final String FILE_DELIMETER = ","; @Autowired private ServerConfig serverConfig; - private static final String FILE_DELIMETER = ","; - /** * 閫氱敤涓嬭浇璇锋眰 - * + * * @param fileName 鏂囦欢鍚嶇О - * @param delete 鏄惁鍒犻櫎 + * @param delete 鏄惁鍒犻櫎 */ @GetMapping("/download") @ApiOperation(value = "閫氱敤涓嬭浇璇锋眰") - public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request) - { - try - { - if (!FileUtils.checkAllowDownload(fileName)) - { + public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request) { + try { + if (!FileUtils.checkAllowDownload(fileName)) { throw new Exception(StringUtils.format("鏂囦欢鍚嶇О({})闈炴硶锛屼笉鍏佽涓嬭浇銆 ", fileName)); } String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1); @@ -65,13 +57,10 @@ public class CommonController response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); FileUtils.setAttachmentResponseHeader(response, realFileName); FileUtils.writeBytes(filePath, response.getOutputStream()); - if (delete) - { + if (delete) { FileUtils.deleteFile(filePath); } - } - catch (Exception e) - { + } catch (Exception e) { log.error("涓嬭浇鏂囦欢澶辫触", e); } } @@ -81,10 +70,8 @@ public class CommonController */ @ApiOperation(value = "閫氱敤涓婁紶璇锋眰锛堝崟涓級") @PostMapping("/upload") - public AjaxResult uploadFile(MultipartFile file) throws Exception - { - try - { + public AjaxResult uploadFile(MultipartFile file) throws Exception { + try { // 涓婁紶鏂囦欢璺緞 String filePath = RuoYiConfig.getUploadPath(); // 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О @@ -96,9 +83,7 @@ public class CommonController ajax.put("newFileName", FileUtils.getName(fileName)); ajax.put("originalFilename", file.getOriginalFilename()); return ajax; - } - catch (Exception e) - { + } catch (Exception e) { return AjaxResult.error(e.getMessage()); } } @@ -108,18 +93,15 @@ public class CommonController */ @ApiOperation(value = "閫氱敤涓婁紶璇锋眰锛堝涓級") @PostMapping("/uploads") - public AjaxResult uploadFiles(List files) throws Exception - { - try - { + public AjaxResult uploadFiles(List files) throws Exception { + try { // 涓婁紶鏂囦欢璺緞 String filePath = RuoYiConfig.getUploadPath(); List urls = new ArrayList(); List fileNames = new ArrayList(); List newFileNames = new ArrayList(); List originalFilenames = new ArrayList(); - for (MultipartFile file : files) - { + for (MultipartFile file : files) { // 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О String fileName = FileUploadUtils.upload(filePath, file); String url = serverConfig.getUrl() + fileName; @@ -134,9 +116,7 @@ public class CommonController ajax.put("newFileNames", StringUtils.join(newFileNames, FILE_DELIMETER)); ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER)); return ajax; - } - catch (Exception e) - { + } catch (Exception e) { return AjaxResult.error(e.getMessage()); } } @@ -147,12 +127,9 @@ public class CommonController @ApiOperation(value = "鏈湴璧勬簮閫氱敤涓嬭浇") @GetMapping("/download/resource") public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response) - throws Exception - { - try - { - if (!FileUtils.checkAllowDownload(resource)) - { + throws Exception { + try { + if (!FileUtils.checkAllowDownload(resource)) { throw new Exception(StringUtils.format("璧勬簮鏂囦欢({})闈炴硶锛屼笉鍏佽涓嬭浇銆 ", resource)); } // 鏈湴璧勬簮璺緞 @@ -164,9 +141,7 @@ public class CommonController response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); FileUtils.setAttachmentResponseHeader(response, downloadName); FileUtils.writeBytes(downloadPath, response.getOutputStream()); - } - catch (Exception e) - { + } catch (Exception e) { log.error("涓嬭浇鏂囦欢澶辫触", e); } } diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index b7cb28d..ff9bd1e 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -100,9 +100,9 @@ token: # mybatis-plus閰嶇疆 mybatis-plus: # 鎼滅储鎸囧畾鍖呭埆鍚 - typeAliasesPackage: com.ruoyi.**.domain + typeAliasesPackage: com.ruoyi.jjh.**.domain,com.ruoyi.jjh.**.entity,com.ruoyi.**.domain # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵鏈夌殑mapper.xml鏄犲皠鏂囦欢 - mapperLocations: classpath*:mapper/**/*Mapper.xml + mapperLocations: classpath*:mapper/jjh/**/*Mapper.xml,classpath*:mapper/**/*Mapper.xml # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠 configLocation: classpath:mybatis/mybatis-config.xml diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsApprovalInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsApprovalInfoMapper.xml new file mode 100644 index 0000000..43e4654 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsApprovalInfoMapper.xml @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select id, + process_id, + declaration_records_id, + approval_status, + approval_opinions, + approval_attachment, + approval_time, + is_review, + sort, + is_before_data, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark + from bms_approval_info + + + + + + + + + insert into bms_approval_info + + process_id, + declaration_records_id, + approval_status, + approval_opinions, + approval_attachment, + approval_time, + is_review, + is_before_data, + sort, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{processId}, + #{declarationRecordsId}, + #{approvalStatus}, + #{approvalOpinions}, + #{approvalAttachment}, + #{approvalTime}, + #{isReview}, + #{isBeforeData}, + #{sort}, + #{isDeleted}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update bms_approval_info + + process_id = #{processId}, + declaration_records_id = #{declarationRecordsId}, + approval_status = #{approvalStatus}, + approval_opinions = #{approvalOpinions}, + approval_attachment = #{approvalAttachment}, + approval_time = #{approvalTime}, + is_review = #{isReview}, + is_before_data = #{isBeforeData}, + sort = #{sort}, + is_deleted = #{isDeleted}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + update bms_approval_info + set is_before_data = 1 + where declaration_records_id = #{declarationRecordsId} + + + + update bms_approval_info set is_before_data = 1 where declaration_records_id = #{item} + + + + + delete + from bms_approval_info + where id = #{id} + + + + delete from bms_approval_info where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsBigStrongAwardMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsBigStrongAwardMapper.xml new file mode 100644 index 0000000..f15720d --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsBigStrongAwardMapper.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + select id, enterprise_id, is_gain_rewards,reward_description, establish_time, development_plan, is_deleted, create_by, create_time, update_by, update_time, remark from bms_big_strong_award + + + + + + + + insert into bms_big_strong_award + + id, + enterprise_id, + is_gain_rewards, + reward_description, + establish_time, + development_plan, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{id}, + #{enterpriseId}, + #{isGainRewards}, + #{rewardDescription}, + #{establishTime}, + #{developmentPlan}, + #{isDeleted}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update bms_big_strong_award + + enterprise_id = #{enterpriseId}, + is_gain_rewards = #{isGainRewards}, + reward_description = #{rewardDescription}, + establish_time = #{establishTime}, + development_plan = #{developmentPlan}, + is_deleted = #{isDeleted}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete + from bms_big_strong_award + where id = #{id} + + + + delete from bms_big_strong_award where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsBrandingAwardMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsBrandingAwardMapper.xml new file mode 100644 index 0000000..eaf6d2f --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsBrandingAwardMapper.xml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + select id, enterprise_id, honors_received, level, evidence, is_deleted, create_by, create_time, update_by, update_time, remark from bms_branding_award + + + + + + + + insert into bms_branding_award + + id, + enterprise_id, + honors_received, + level, + evidence, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{id}, + #{enterpriseId}, + #{honorsReceived}, + #{level}, + #{evidence}, + #{isDeleted}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update bms_branding_award + + enterprise_id = #{enterpriseId}, + honors_received = #{honorsReceived}, + level = #{level}, + evidence = #{evidence}, + is_deleted = #{isDeleted}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from bms_branding_award where id = #{id} + + + + delete from bms_branding_award where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsCarrierConstructionAwardMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsCarrierConstructionAwardMapper.xml new file mode 100644 index 0000000..a736ee7 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsCarrierConstructionAwardMapper.xml @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + select id, + enterprise_id, + project_name, + quantity_proportion, + revenue_proportion, + personnel_proportion, + supporting_materials, + business_license, + fire_report, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark + from bms_carrier_construction_award + + + + + + + + insert into bms_carrier_construction_award + + id, + enterprise_id, + project_name, + quantity_proportion, + revenue_proportion, + personnel_proportion, + supporting_materials, + business_license, + fire_report, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{id}, + #{enterpriseId}, + #{projectName}, + #{quantityProportion}, + #{revenueProportion}, + #{personnelProportion}, + #{supportingMaterials}, + #{businessLicense}, + #{fireReport}, + #{isDeleted}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update bms_carrier_construction_award + + enterprise_id = #{enterpriseId}, + project_name = #{projectName}, + quantity_proportion = #{quantityProportion}, + revenue_proportion = #{revenueProportion}, + personnel_proportion = #{personnelProportion}, + supporting_materials = #{supportingMaterials}, + business_license = #{businessLicense}, + fire_report = #{fireReport}, + is_deleted = #{isDeleted}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete + from bms_carrier_construction_award + where id = #{id} + + + + delete from bms_carrier_construction_award where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsCreditManagementMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsCreditManagementMapper.xml new file mode 100644 index 0000000..e2b544b --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsCreditManagementMapper.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + select id, + enterprise_id, + project_plan, + uses_funds, + audit_report, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark + from bms_credit_management + + + + + + + + insert into bms_credit_management + + enterprise_id, + project_plan, + uses_funds, + audit_report, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{enterpriseId}, + #{projectPlan}, + #{usesFunds}, + #{auditReport}, + #{isDeleted}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update bms_credit_management + + enterprise_id = #{enterpriseId}, + project_plan = #{projectPlan}, + uses_funds = #{usesFunds}, + audit_report = #{auditReport}, + is_deleted = #{isDeleted}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete + from bms_credit_management + where id = #{id} + + + + delete from bms_credit_management where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml new file mode 100644 index 0000000..fd40213 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml @@ -0,0 +1,329 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, + project_name, + project_id, + matter, + enterprise_id, year, template_record_id, declaration_template_type, detail_id, status, is_deleted, create_by, create_time, update_by, update_time, remark + from bms_declaration_records + + + + + + + + + + + insert into bms_declaration_records + + project_name, + project_id, + matter, + enterprise_id, + template_record_id, + year, + detail_id, + declaration_template_type, + status, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{projectName}, + #{projectId}, + #{matter}, + #{enterpriseId}, + #{templateRecordId}, + #{year}, + #{detailId}, + #{declarationTemplateType}, + #{status}, + #{isDeleted}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update bms_declaration_records + + project_name = #{projectName}, + project_id = #{projectId}, + matter = #{matter}, + enterprise_id = #{enterpriseId}, + template_record_id = #{templateRecordId}, + year = #{year}, + detail_id = #{detailId}, + declaration_template_type = #{declarationTemplateType}, + status = #{status}, + is_deleted = #{isDeleted}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete + from bms_declaration_records + where id = #{id} + + + + delete from bms_declaration_records where id in + + #{id} + + + + + update bms_declaration_records + set project_name= #{projectName}, + project_id = #{projectId} + where detail_id = #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml new file mode 100644 index 0000000..012876c --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + select id, enterprise_name, credit_code, contacts, contacts_number, address, is_deleted, create_by, create_time, update_by, update_time, remark from bms_enterprise_basic_info + + + + + + + + insert into bms_enterprise_basic_info + + id, + enterprise_name, + credit_code, + contacts, + contacts_number, + address, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{id}, + #{enterpriseName}, + #{creditCode}, + #{contacts}, + #{contactsNumber}, + #{address}, + #{isDeleted}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update bms_enterprise_basic_info + + enterprise_name = #{enterpriseName}, + credit_code = #{creditCode}, + contacts = #{contacts}, + contacts_number = #{contactsNumber}, + address = #{address}, + is_deleted = #{isDeleted}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete + from bms_enterprise_basic_info + where id = #{id} + + + + delete from bms_enterprise_basic_info where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseDirectoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseDirectoryMapper.xml new file mode 100644 index 0000000..9903af7 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseDirectoryMapper.xml @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + select id, + template_record_id, + enterprise_name, + credit_code, + create_by, + create_time, + update_by, + update_time, + remark + from bms_enterprise_directory + + + + + + + + insert into bms_enterprise_directory + + template_record_id, + enterprise_name, + credit_code, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{templateRecordId}, + #{enterpriseName}, + #{creditCode}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update bms_enterprise_directory + + template_record_id = #{templateId}, + enterprise_name = #{enterpriseName}, + credit_code = #{creditCode}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete + from bms_enterprise_directory + where id = #{id} + + + + delete from bms_enterprise_directory where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsFieldInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsFieldInfoMapper.xml new file mode 100644 index 0000000..a6fbf00 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsFieldInfoMapper.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + select id, + detail_id, + field_name, + field_result, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark + from bms_field_info + + + + + + + + insert into bms_field_info + + detail_id, + field_name, + field_result, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{detailId}, + #{fieldName}, + #{fieldResult}, + #{isDeleted}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update bms_field_info + + detail_id = #{detailId}, + field_name = #{fieldName}, + field_result = #{fieldResult}, + is_deleted = #{isDeleted}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete + from bms_field_info + where id = #{id} + + + + delete from bms_field_info where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsFileInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsFileInfoMapper.xml new file mode 100644 index 0000000..5b544db --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsFileInfoMapper.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + select id, + detail_id, + file_name, + file_description, + file_url, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark + from bms_file_info + + + + + + + + insert into bms_file_info + + detail_id, + file_name, + file_description, + file_url, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{detailId}, + #{fileName}, + #{fileDescription}, + #{fileUrl}, + #{isDeleted}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update bms_file_info + + detail_id = #{detailId}, + file_name = #{fileName}, + file_description = #{fileDescription}, + file_url = #{fileUrl}, + is_deleted = #{isDeleted}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete + from bms_file_info + where id = #{id} + + + + delete from bms_file_info where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsFundingDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsFundingDetailMapper.xml new file mode 100644 index 0000000..3759b29 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsFundingDetailMapper.xml @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + select id, + type, + template_record_id, + v_model, + detail_id, + year, + illustrate, + amount, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark + from bms_funding_detail + + + + + + + + insert into bms_funding_detail + + type, + template_record_id, + detail_id, + v_model, + year, + illustrate, + amount, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{type}, + #{templateRecordId}, + #{detailId}, + #{vModel}, + #{year}, + #{illustrate}, + #{amount}, + #{isDeleted}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update bms_funding_detail + + type = #{type}, + template_record_id = #{templateRecordId}, + detail_id = #{detailId}, + v_model = #{vModel}, + year = #{year}, + illustrate = #{illustrate}, + amount = #{amount}, + is_deleted = #{isDeleted}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete + from bms_funding_detail + where id = #{id} + + + + delete from bms_funding_detail where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsIndustrialInternetAwardMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsIndustrialInternetAwardMapper.xml new file mode 100644 index 0000000..c07524c --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsIndustrialInternetAwardMapper.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + select id, + enterprise_id, + honorary_name, + material, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark + from bms_industrial_internet_award + + + + + + + + insert into bms_industrial_internet_award + + id, + enterprise_id, + honorary_name, + material, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{id}, + #{enterpriseId}, + #{honoraryName}, + #{material}, + #{isDeleted}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update bms_industrial_internet_award + + enterprise_id = #{enterpriseId}, + honorary_name = #{honoraryName}, + material = #{material}, + is_deleted = #{isDeleted}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete + from bms_industrial_internet_award + where id = #{id} + + + + delete from bms_industrial_internet_award where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsIntegrationIndustriesMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsIntegrationIndustriesMapper.xml new file mode 100644 index 0000000..cc841d7 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsIntegrationIndustriesMapper.xml @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, + enterprise_id, + declaration_type, + evidence, + business_license, + tax_payment_certificate, + audit_report, + equity_structure_chart, + declaration_report, + independent_accounting, + capital_verification_report, + other_evidence, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark + from bms_integration_industries + + + + + + + + insert into bms_integration_industries + + enterprise_id, + declaration_type, + evidence, + business_license, + tax_payment_certificate, + audit_report, + equity_structure_chart, + declaration_report, + independent_accounting, + capital_verification_report, + other_evidence, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{enterpriseId}, + #{declarationType}, + #{evidence}, + #{businessLicense}, + #{taxPaymentCertificate}, + #{auditReport}, + #{equityStructureChart}, + #{declarationReport}, + #{independentAccounting}, + #{capitalVerificationReport}, + #{otherEvidence}, + #{isDeleted}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update bms_integration_industries + + enterprise_id = #{enterpriseId}, + declaration_type = #{declarationType}, + evidence = #{evidence}, + business_license = #{businessLicense}, + tax_payment_certificate = #{taxPaymentCertificate}, + audit_report = #{auditReport}, + equity_structure_chart = #{equityStructureChart}, + declaration_report = #{declarationReport}, + independent_accounting = #{independentAccounting}, + capital_verification_report = #{capitalVerificationReport}, + + other_evidence = #{otherEvidence}, + is_deleted = #{isDeleted}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete + from bms_integration_industries + where id = #{id} + + + + delete from bms_integration_industries where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsLogisticsDevelopmentAwardMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsLogisticsDevelopmentAwardMapper.xml new file mode 100644 index 0000000..c33c5e9 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsLogisticsDevelopmentAwardMapper.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + select id, + enterprise_id, + Honor_certificate, + platform_name, + filing_notice, + audit_report, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark + from bms_logistics_development_award + + + + + + + + insert into bms_logistics_development_award + + id, + enterprise_id, + Honor_certificate, + platform_name, + filing_notice, + audit_report, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{id}, + #{enterpriseId}, + #{honorCertificate}, + #{platformName}, + #{filingNotice}, + #{auditReport}, + #{isDeleted}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update bms_logistics_development_award + + enterprise_id = #{enterpriseId}, + Honor_certificate = #{honorCertificate}, + platform_name = #{platformName}, + filing_notice = #{filingNotice}, + audit_report = #{auditReport}, + is_deleted = #{isDeleted}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete + from bms_logistics_development_award + where id = #{id} + + + + delete from bms_logistics_development_award where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsManufacturingServicesAwardMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsManufacturingServicesAwardMapper.xml new file mode 100644 index 0000000..ab17b1b --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsManufacturingServicesAwardMapper.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + select id, + enterprise_id, + filing_notice, + invoice, + audit_report, + financial_statements, + is_deleted, + create_by, + create_time, + update_by, + update_time + from bms_manufacturing_services_award + + + + + + + + insert into bms_manufacturing_services_award + + id, + enterprise_id, + filing_notice, + invoice, + audit_report, + financial_statements, + is_deleted, + create_by, + create_time, + update_by, + update_time, + + + #{id}, + #{enterpriseId}, + #{filingNotice}, + #{invoice}, + #{auditReport}, + #{financialStatements}, + #{isDeleted}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update bms_manufacturing_services_award + + enterprise_id = #{enterpriseId}, + filing_notice = #{filingNotice}, + invoice = #{invoice}, + audit_report = #{auditReport}, + financial_statements = #{financialStatements}, + is_deleted = #{isDeleted}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete + from bms_manufacturing_services_award + where id = #{id} + + + + delete from bms_manufacturing_services_award where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsPlatformConstructionAwardMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsPlatformConstructionAwardMapper.xml new file mode 100644 index 0000000..d8d2f5e --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsPlatformConstructionAwardMapper.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + select id, + enterprise_id, + platform_name, + agreement, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark + from bms_platform_construction_award + + + + + + + + insert into bms_platform_construction_award + + id, + enterprise_id, + platform_name, + agreement, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{id}, + #{enterpriseId}, + #{platformName}, + #{agreement}, + #{isDeleted}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update bms_platform_construction_award + + enterprise_id = #{enterpriseId}, + platform_name = #{platformName}, + agreement = #{agreement}, + is_deleted = #{isDeleted}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete + from bms_platform_construction_award + where id = #{id} + + + + delete from bms_platform_construction_award where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsProcessInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsProcessInfoMapper.xml new file mode 100644 index 0000000..ea6c171 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsProcessInfoMapper.xml @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + select id, + approval_type, + approval_level, + approval_dept, + approval_by_id, + approval_by_ids, + next_process_id, + sort, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark + from bms_process_info + + + + + + + + insert into bms_process_info + + approval_type, + approval_level, + approval_dept, + approval_by_id, + approval_by_ids, + next_process_id, + sort, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{approvalType}, + #{approvalLevel}, + #{approvalDept}, + #{approvalById}, + #{approvalByIds}, + #{nextProcessId}, + #{sort}, + #{isDeleted}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update bms_process_info + + approval_type = #{approvalType}, + approval_level = #{approvalLevel}, + approval_dept = #{approvalDept}, + approval_by_id = #{approvalById}, + approval_by_ids = #{approvalByIds}, + next_process_id = #{nextProcessId}, + sort = #{sort}, + is_deleted = #{isDeleted}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete + from bms_process_info + where id = #{id} + + + + delete from bms_process_info where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsProjectInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsProjectInfoMapper.xml new file mode 100644 index 0000000..b780d82 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsProjectInfoMapper.xml @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + select id, + declaration_template_type, + project_name, + enterprise_id, + product_area, + year, + start_time, + end_time, + completion_time, + support_methods, + declaration_time, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark + from bms_project_info + + + + + + + + + insert into bms_project_info + + declaration_template_type, + project_name, + enterprise_id, + product_area, + year, + start_time, + end_time, + completion_time, + support_methods, + declaration_time, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{declarationTemplateType}, + #{projectName}, + #{enterpriseId}, + #{productArea}, + #{year}, + #{startTime}, + #{endTime}, + #{completionTime}, + #{supportMethods}, + #{declarationTime}, + #{isDeleted}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update bms_project_info + + declaration_template_type = #{declarationTemplateType}, + project_name = #{projectName}, + enterprise_id = #{enterpriseId}, + product_area = #{productArea}, + year = #{year}, + start_time = #{startTime}, + end_time = #{endTime}, + completion_time = #{completionTime}, + support_methods = #{supportMethods}, + declaration_time = #{declarationTime}, + is_deleted = #{isDeleted}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete + from bms_project_info + where id = #{id} + + + + delete from bms_project_info where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsProjectSettlementAwardMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsProjectSettlementAwardMapper.xml new file mode 100644 index 0000000..38be136 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsProjectSettlementAwardMapper.xml @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + + + + select id, + enterprise_id, + establish_time, + employee_num, + agreement, + report, + business_license, + other_materials, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark + from bms_project_settlement_award + + + + + + + + insert into bms_project_settlement_award + + id, + enterprise_id, + establish_time, + employee_num, + agreement, + report, + business_license, + other_materials, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{id}, + #{enterpriseId}, + #{establishTime}, + #{employeeNum}, + #{agreement}, + #{report}, + #{businessLicense}, + #{otherMaterials}, + #{isDeleted}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update bms_project_settlement_award + + enterprise_id = #{enterpriseId}, + establish_time = #{establishTime}, + employee_num = #{employeeNum}, + agreement = #{agreement}, + report = #{report}, + business_license = #{businessLicense}, + other_materials = #{otherMaterials}, + is_deleted = #{isDeleted}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete + from bms_project_settlement_award + where id = #{id} + + + + delete from bms_project_settlement_award where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsSceneOpeningAwardMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsSceneOpeningAwardMapper.xml new file mode 100644 index 0000000..f83822e --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsSceneOpeningAwardMapper.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + select id, + enterprise_id, + project_name, + type, + material, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark + from bms_scene_opening_award + + + + + + + + insert into bms_scene_opening_award + + id, + enterprise_id, + project_name, + type, + material, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{id}, + #{enterpriseId}, + #{projectName}, + #{type}, + #{material}, + #{isDeleted}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update bms_scene_opening_award + + enterprise_id = #{enterpriseId}, + project_name = #{projectName}, + type = #{type}, + material = #{material}, + is_deleted = #{isDeleted}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete + from bms_scene_opening_award + where id = #{id} + + + + delete from bms_scene_opening_award where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateInfoMapper.xml new file mode 100644 index 0000000..9e030d8 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateInfoMapper.xml @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + select id, + template_name, + level, + product_area, + type, + notes, + responsibility_unit, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark + from bms_template_info + + + + + + + + + + insert into bms_template_info + + id, + template_name, + level, + product_area, + type, + notes, + responsibility_unit, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{id}, + #{templateName}, + #{level}, + #{productArea}, + #{type}, + #{notes}, + #{responsibilityUnit}, + #{isDeleted}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update bms_template_info + + template_name = #{templateName}, + level = #{level}, + product_area = #{productArea}, + type = #{type}, + notes = #{notes}, + responsibility_unit = #{responsibilityUnit}, + is_deleted = #{isDeleted}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete + from bms_template_info + where id = #{id} + + + + delete from bms_template_info where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateRecordMapper.xml new file mode 100644 index 0000000..7e7ecf3 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateRecordMapper.xml @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + select id, + template_id, + enterprise_directory, + start_time, + end_time, + file_name, + road, + notes, + create_by, + create_time, + update_by, + update_time, + remark + from bms_template_record + + + + + + + + insert into bms_template_record + + template_id, + enterprise_directory, + start_time, + end_time, + road, + file_name, + notes, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{templateId}, + #{enterpriseDirectory}, + #{startTime}, + #{endTime}, + #{road}, + #{fileName}, + #{notes}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update bms_template_record + + template_id = #{templateId}, + enterprise_directory = #{enterpriseDirectory}, + start_time = #{startTime}, + end_time = #{endTime}, + road = #{road}, + file_name = #{fileName}, + notes = #{notes}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete + from bms_template_record + where id = #{id} + + + + delete from bms_template_record where id in + + #{id} + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BsmFundingInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BsmFundingInfoMapper.xml new file mode 100644 index 0000000..c044d1d --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BsmFundingInfoMapper.xml @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, + type, + template_id, + detail_id, + revenue_year, + revenue, + taxation_year, + taxation, + expected_revenue_year, + expected_revenue, + expected_taxation_year, + expected_taxation, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark + from bsm_funding_info + + + + + + + + insert into bsm_funding_info + + id, + type, + template_id, + detail_id, + revenue_year, + revenue, + taxation_year, + taxation, + expected_revenue_year, + expected_revenue, + expected_taxation_year, + expected_taxation, + is_deleted, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{id}, + #{type}, + #{templateId}, + #{detailId}, + #{revenueYear}, + #{revenue}, + #{taxationYear}, + #{taxation}, + #{expectedRevenueYear}, + #{expectedRevenue}, + #{expectedTaxationYear}, + #{expectedTaxation}, + #{isDeleted}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update bsm_funding_info + + type = #{type}, + template_id = #{templateId}, + detail_id = #{detailId}, + revenue_year = #{revenueYear}, + revenue = #{revenue}, + taxation_year = #{taxationYear}, + taxation = #{taxation}, + expected_revenue_year = #{expectedRevenueYear}, + expected_revenue = #{expectedRevenue}, + expected_taxation_year = #{expectedTaxationYear}, + expected_taxation = #{expectedTaxation}, + is_deleted = #{isDeleted}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete + from bsm_funding_info + where id = #{id} + + + + delete from bsm_funding_info where id in + + #{id} + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/JMemorandumMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JMemorandumMapper.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/jjh/JMemorandumMapper.xml rename to ruoyi-admin/src/main/resources/mapper/jjh/ent/JMemorandumMapper.xml diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/JProjectMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectMapper.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/jjh/JProjectMapper.xml rename to ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectMapper.xml diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 1c939ed..b742b50 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -8,7 +8,9 @@ 3.8.7 4.0.0 - + + 2.14.2 + ruoyi-common @@ -16,6 +18,12 @@ + + + com.alibaba + transmittable-thread-local + ${transmittable-thread-local.version} + com.baomidou @@ -58,19 +66,19 @@ org.apache.commons commons-lang3 - + com.fasterxml.jackson.core jackson-databind - + - - com.baomidou - dynamic-datasource-spring-boot-starter - 3.5.2 - + + com.baomidou + dynamic-datasource-spring-boot-starter + 3.5.2 + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/SecurityConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/SecurityConstants.java new file mode 100644 index 0000000..af79f0a --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/SecurityConstants.java @@ -0,0 +1,48 @@ +package com.ruoyi.common.constant; + +/** + * 鏉冮檺鐩稿叧閫氱敤甯搁噺 + * + * @author ruoyi + */ +public class SecurityConstants { + /** + * 鐢ㄦ埛ID瀛楁 + */ + public static final String DETAILS_USER_ID = "user_id"; + + /** + * 鐢ㄦ埛鍚嶅瓧娈 + */ + public static final String DETAILS_USERNAME = "username"; + + /** + * 鎺堟潈淇℃伅瀛楁 + */ + public static final String AUTHORIZATION_HEADER = "authorization"; + + /** + * 璇锋眰鏉ユ簮 + */ + public static final String FROM_SOURCE = "from-source"; + + /** + * 鍐呴儴璇锋眰 + */ + public static final String INNER = "inner"; + + /** + * 鐢ㄦ埛鏍囪瘑 + */ + public static final String USER_KEY = "user_key"; + + /** + * 鐧诲綍鐢ㄦ埛 + */ + public static final String LOGIN_USER = "login_user"; + + /** + * 瑙掕壊鏉冮檺 + */ + public static final String ROLE_PERMISSION = "role_permission"; +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/context/SecurityContextHolder.java b/ruoyi-common/src/main/java/com/ruoyi/common/context/SecurityContextHolder.java new file mode 100644 index 0000000..a547ff6 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/context/SecurityContextHolder.java @@ -0,0 +1,84 @@ +package com.ruoyi.common.context; + + +import com.alibaba.ttl.TransmittableThreadLocal; +import com.ruoyi.common.constant.SecurityConstants; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.StringUtils; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * 鑾峰彇褰撳墠绾跨▼鍙橀噺涓殑 鐢ㄦ埛id銆佺敤鎴峰悕绉般乀oken绛変俊鎭 + * 娉ㄦ剰锛 蹇呴』鍦ㄧ綉鍏抽氳繃璇锋眰澶寸殑鏂规硶浼犲叆锛屽悓鏃跺湪HeaderInterceptor鎷︽埅鍣ㄨ缃笺 鍚﹀垯杩欓噷鏃犳硶鑾峰彇 + * + * @author ruoyi + */ +public class SecurityContextHolder { + private static final TransmittableThreadLocal> THREAD_LOCAL = new TransmittableThreadLocal<>(); + + public static void set(String key, Object value) { + Map map = getLocalMap(); + map.put(key, value == null ? StringUtils.EMPTY : value); + } + + public static String get(String key) { + Map map = getLocalMap(); + return Convert.toStr(map.getOrDefault(key, StringUtils.EMPTY)); + } + + public static T get(String key, Class clazz) { + Map map = getLocalMap(); + return StringUtils.cast(map.getOrDefault(key, null)); + } + + public static Map getLocalMap() { + Map map = THREAD_LOCAL.get(); + if (map == null) { + map = new ConcurrentHashMap(); + THREAD_LOCAL.set(map); + } + return map; + } + + public static void setLocalMap(Map threadLocalMap) { + THREAD_LOCAL.set(threadLocalMap); + } + + public static Long getUserId() { + return Convert.toLong(get(SecurityConstants.DETAILS_USER_ID), 0L); + } + + public static void setUserId(String account) { + set(SecurityConstants.DETAILS_USER_ID, account); + } + + public static String getUserName() { + return get(SecurityConstants.DETAILS_USERNAME); + } + + public static void setUserName(String username) { + set(SecurityConstants.DETAILS_USERNAME, username); + } + + public static String getUserKey() { + return get(SecurityConstants.USER_KEY); + } + + public static void setUserKey(String userKey) { + set(SecurityConstants.USER_KEY, userKey); + } + + public static String getPermission() { + return get(SecurityConstants.ROLE_PERMISSION); + } + + public static void setPermission(String permissions) { + set(SecurityConstants.ROLE_PERMISSION, permissions); + } + + public static void remove() { + THREAD_LOCAL.remove(); + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java index bd835db..39cd358 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java @@ -1,77 +1,74 @@ package com.ruoyi.common.core.domain; -import java.io.Serializable; -import java.util.List; -import java.util.stream.Collectors; import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysMenu; +import java.io.Serializable; +import java.util.List; +import java.util.stream.Collectors; + /** * Treeselect鏍戠粨鏋勫疄浣撶被 - * + * * @author ruoyi */ -public class TreeSelect implements Serializable -{ +public class TreeSelect implements Serializable { private static final long serialVersionUID = 1L; - /** 鑺傜偣ID */ + /** + * 鑺傜偣ID + */ private Long id; - /** 鑺傜偣鍚嶇О */ + /** + * 鑺傜偣鍚嶇О + */ private String label; - /** 瀛愯妭鐐 */ + /** + * 瀛愯妭鐐 + */ @JsonInclude(JsonInclude.Include.NON_EMPTY) private List children; - public TreeSelect() - { + public TreeSelect() { } - public TreeSelect(SysDept dept) - { + public TreeSelect(SysDept dept) { this.id = dept.getDeptId(); this.label = dept.getDeptName(); this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); } - public TreeSelect(SysMenu menu) - { + public TreeSelect(SysMenu menu) { this.id = menu.getMenuId(); this.label = menu.getMenuName(); this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); } - public Long getId() - { + public Long getId() { return id; } - public void setId(Long id) - { + public void setId(Long id) { this.id = id; } - public String getLabel() - { + public String getLabel() { return label; } - public void setLabel(String label) - { + public void setLabel(String label) { this.label = label; } - public List getChildren() - { + public List getChildren() { return children; } - public void setChildren(List children) - { + public void setChildren(List children) { this.children = children; } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java index fb18c5c..98ea901 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java @@ -1,203 +1,203 @@ package com.ruoyi.common.core.domain.entity; -import java.util.ArrayList; -import java.util.List; +import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.domain.BaseEntity; +import java.util.ArrayList; +import java.util.List; /** * 閮ㄩ棬琛 sys_dept - * + * * @author ruoyi */ -public class SysDept extends BaseEntity -{ +public class SysDept extends BaseEntity { private static final long serialVersionUID = 1L; - /** 閮ㄩ棬ID */ + /** + * 閮ㄩ棬ID + */ private Long deptId; - /** 鐖堕儴闂↖D */ + /** + * 鐖堕儴闂↖D + */ private Long parentId; - /** 绁栫骇鍒楄〃 */ + /** + * 绁栫骇鍒楄〃 + */ private String ancestors; - /** 閮ㄩ棬鍚嶇О */ + /** + * 閮ㄩ棬鍚嶇О + */ private String deptName; - /** 鏄剧ず椤哄簭 */ + /** + * 鏄剧ず椤哄簭 + */ private Integer orderNum; - /** 璐熻矗浜 */ + /** + * 璐熻矗浜 + */ private String leader; - /** 鑱旂郴鐢佃瘽 */ + /** + * 鑱旂郴鐢佃瘽 + */ private String phone; - /** 閭 */ + /** + * 閭 + */ private String email; - /** 閮ㄩ棬鐘舵:0姝e父,1鍋滅敤 */ + /** + * 閮ㄩ棬鐘舵:0姝e父,1鍋滅敤 + */ private String status; - /** 鍒犻櫎鏍囧織锛0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛 */ + /** + * 鍒犻櫎鏍囧織锛0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛 + */ private String delFlag; - /** 鐖堕儴闂ㄥ悕绉 */ + /** + * 鐖堕儴闂ㄥ悕绉 + */ private String parentName; - - /** 瀛愰儴闂 */ + + /** + * 瀛愰儴闂 + */ private List children = new ArrayList(); - public Long getDeptId() - { + public Long getDeptId() { return deptId; } - public void setDeptId(Long deptId) - { + public void setDeptId(Long deptId) { this.deptId = deptId; } - public Long getParentId() - { + public Long getParentId() { return parentId; } - public void setParentId(Long parentId) - { + public void setParentId(Long parentId) { this.parentId = parentId; } - public String getAncestors() - { + public String getAncestors() { return ancestors; } - public void setAncestors(String ancestors) - { + public void setAncestors(String ancestors) { this.ancestors = ancestors; } @NotBlank(message = "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖") @Size(min = 0, max = 30, message = "閮ㄩ棬鍚嶇О闀垮害涓嶈兘瓒呰繃30涓瓧绗") - public String getDeptName() - { + public String getDeptName() { return deptName; } - public void setDeptName(String deptName) - { + public void setDeptName(String deptName) { this.deptName = deptName; } @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖") - public Integer getOrderNum() - { + public Integer getOrderNum() { return orderNum; } - public void setOrderNum(Integer orderNum) - { + public void setOrderNum(Integer orderNum) { this.orderNum = orderNum; } - public String getLeader() - { + public String getLeader() { return leader; } - public void setLeader(String leader) - { + public void setLeader(String leader) { this.leader = leader; } @Size(min = 0, max = 11, message = "鑱旂郴鐢佃瘽闀垮害涓嶈兘瓒呰繃11涓瓧绗") - public String getPhone() - { + public String getPhone() { return phone; } - public void setPhone(String phone) - { + public void setPhone(String phone) { this.phone = phone; } @Email(message = "閭鏍煎紡涓嶆纭") @Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗") - public String getEmail() - { + public String getEmail() { return email; } - public void setEmail(String email) - { + public void setEmail(String email) { this.email = email; } - public String getStatus() - { + public String getStatus() { return status; } - public void setStatus(String status) - { + public void setStatus(String status) { this.status = status; } - public String getDelFlag() - { + public String getDelFlag() { return delFlag; } - public void setDelFlag(String delFlag) - { + public void setDelFlag(String delFlag) { this.delFlag = delFlag; } - public String getParentName() - { + public String getParentName() { return parentName; } - public void setParentName(String parentName) - { + public void setParentName(String parentName) { this.parentName = parentName; } - public List getChildren() - { + public List getChildren() { return children; } - public void setChildren(List children) - { + public void setChildren(List children) { this.children = children; } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("deptId", getDeptId()) - .append("parentId", getParentId()) - .append("ancestors", getAncestors()) - .append("deptName", getDeptName()) - .append("orderNum", getOrderNum()) - .append("leader", getLeader()) - .append("phone", getPhone()) - .append("email", getEmail()) - .append("status", getStatus()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("deptId", getDeptId()) + .append("parentId", getParentId()) + .append("ancestors", getAncestors()) + .append("deptName", getDeptName()) + .append("orderNum", getOrderNum()) + .append("leader", getLeader()) + .append("phone", getPhone()) + .append("email", getEmail()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java index 488d49c..6dd6528 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java @@ -1,241 +1,237 @@ package com.ruoyi.common.core.domain.entity; -import java.util.Set; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel.ColumnType; import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.util.Set; /** * 瑙掕壊琛 sys_role - * + * * @author ruoyi */ -public class SysRole extends BaseEntity -{ +public class SysRole extends BaseEntity { private static final long serialVersionUID = 1L; - /** 瑙掕壊ID */ + /** + * 瑙掕壊ID + */ @Excel(name = "瑙掕壊搴忓彿", cellType = ColumnType.NUMERIC) private Long roleId; - /** 瑙掕壊鍚嶇О */ + /** + * 瑙掕壊鍚嶇О + */ @Excel(name = "瑙掕壊鍚嶇О") private String roleName; - /** 瑙掕壊鏉冮檺 */ + /** + * 瑙掕壊鏉冮檺 + */ @Excel(name = "瑙掕壊鏉冮檺") private String roleKey; - /** 瑙掕壊鎺掑簭 */ + /** + * 瑙掕壊鎺掑簭 + */ @Excel(name = "瑙掕壊鎺掑簭") private Integer roleSort; - /** 鏁版嵁鑼冨洿锛1锛氭墍鏈夋暟鎹潈闄愶紱2锛氳嚜瀹氫箟鏁版嵁鏉冮檺锛3锛氭湰閮ㄩ棬鏁版嵁鏉冮檺锛4锛氭湰閮ㄩ棬鍙婁互涓嬫暟鎹潈闄愶紱5锛氫粎鏈汉鏁版嵁鏉冮檺锛 */ + /** + * 鏁版嵁鑼冨洿锛1锛氭墍鏈夋暟鎹潈闄愶紱2锛氳嚜瀹氫箟鏁版嵁鏉冮檺锛3锛氭湰閮ㄩ棬鏁版嵁鏉冮檺锛4锛氭湰閮ㄩ棬鍙婁互涓嬫暟鎹潈闄愶紱5锛氫粎鏈汉鏁版嵁鏉冮檺锛 + */ @Excel(name = "鏁版嵁鑼冨洿", readConverterExp = "1=鎵鏈夋暟鎹潈闄,2=鑷畾涔夋暟鎹潈闄,3=鏈儴闂ㄦ暟鎹潈闄,4=鏈儴闂ㄥ強浠ヤ笅鏁版嵁鏉冮檺,5=浠呮湰浜烘暟鎹潈闄") private String dataScope; - /** 鑿滃崟鏍戦夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙 0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀猴級 */ + /** + * 鑿滃崟鏍戦夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙 0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀猴級 + */ private boolean menuCheckStrictly; - /** 閮ㄩ棬鏍戦夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀 锛 */ + /** + * 閮ㄩ棬鏍戦夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀 锛 + */ private boolean deptCheckStrictly; - /** 瑙掕壊鐘舵侊紙0姝e父 1鍋滅敤锛 */ + /** + * 瑙掕壊鐘舵侊紙0姝e父 1鍋滅敤锛 + */ @Excel(name = "瑙掕壊鐘舵", readConverterExp = "0=姝e父,1=鍋滅敤") private String status; - /** 鍒犻櫎鏍囧織锛0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛 */ + /** + * 鍒犻櫎鏍囧織锛0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛 + */ private String delFlag; - /** 鐢ㄦ埛鏄惁瀛樺湪姝よ鑹叉爣璇 榛樿涓嶅瓨鍦 */ + /** + * 鐢ㄦ埛鏄惁瀛樺湪姝よ鑹叉爣璇 榛樿涓嶅瓨鍦 + */ private boolean flag = false; - /** 鑿滃崟缁 */ + /** + * 鑿滃崟缁 + */ private Long[] menuIds; - /** 閮ㄩ棬缁勶紙鏁版嵁鏉冮檺锛 */ + /** + * 閮ㄩ棬缁勶紙鏁版嵁鏉冮檺锛 + */ private Long[] deptIds; - /** 瑙掕壊鑿滃崟鏉冮檺 */ + /** + * 瑙掕壊鑿滃崟鏉冮檺 + */ private Set permissions; - public SysRole() - { + public SysRole() { } - public SysRole(Long roleId) - { + public SysRole(Long roleId) { this.roleId = roleId; } - public Long getRoleId() - { + public static boolean isAdmin(Long roleId) { + return roleId != null && 1L == roleId; + } + + public Long getRoleId() { return roleId; } - public void setRoleId(Long roleId) - { + public void setRoleId(Long roleId) { this.roleId = roleId; } - public boolean isAdmin() - { + public boolean isAdmin() { return isAdmin(this.roleId); } - public static boolean isAdmin(Long roleId) - { - return roleId != null && 1L == roleId; - } - @NotBlank(message = "瑙掕壊鍚嶇О涓嶈兘涓虹┖") @Size(min = 0, max = 30, message = "瑙掕壊鍚嶇О闀垮害涓嶈兘瓒呰繃30涓瓧绗") - public String getRoleName() - { + public String getRoleName() { return roleName; } - public void setRoleName(String roleName) - { + public void setRoleName(String roleName) { this.roleName = roleName; } @NotBlank(message = "鏉冮檺瀛楃涓嶈兘涓虹┖") @Size(min = 0, max = 100, message = "鏉冮檺瀛楃闀垮害涓嶈兘瓒呰繃100涓瓧绗") - public String getRoleKey() - { + public String getRoleKey() { return roleKey; } - public void setRoleKey(String roleKey) - { + public void setRoleKey(String roleKey) { this.roleKey = roleKey; } @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖") - public Integer getRoleSort() - { + public Integer getRoleSort() { return roleSort; } - public void setRoleSort(Integer roleSort) - { + public void setRoleSort(Integer roleSort) { this.roleSort = roleSort; } - public String getDataScope() - { + public String getDataScope() { return dataScope; } - public void setDataScope(String dataScope) - { + public void setDataScope(String dataScope) { this.dataScope = dataScope; } - public boolean isMenuCheckStrictly() - { + public boolean isMenuCheckStrictly() { return menuCheckStrictly; } - public void setMenuCheckStrictly(boolean menuCheckStrictly) - { + public void setMenuCheckStrictly(boolean menuCheckStrictly) { this.menuCheckStrictly = menuCheckStrictly; } - public boolean isDeptCheckStrictly() - { + public boolean isDeptCheckStrictly() { return deptCheckStrictly; } - public void setDeptCheckStrictly(boolean deptCheckStrictly) - { + public void setDeptCheckStrictly(boolean deptCheckStrictly) { this.deptCheckStrictly = deptCheckStrictly; } - public String getStatus() - { + public String getStatus() { return status; } - public void setStatus(String status) - { + public void setStatus(String status) { this.status = status; } - public String getDelFlag() - { + public String getDelFlag() { return delFlag; } - public void setDelFlag(String delFlag) - { + public void setDelFlag(String delFlag) { this.delFlag = delFlag; } - public boolean isFlag() - { + public boolean isFlag() { return flag; } - public void setFlag(boolean flag) - { + public void setFlag(boolean flag) { this.flag = flag; } - public Long[] getMenuIds() - { + public Long[] getMenuIds() { return menuIds; } - public void setMenuIds(Long[] menuIds) - { + public void setMenuIds(Long[] menuIds) { this.menuIds = menuIds; } - public Long[] getDeptIds() - { + public Long[] getDeptIds() { return deptIds; } - public void setDeptIds(Long[] deptIds) - { + public void setDeptIds(Long[] deptIds) { this.deptIds = deptIds; } - public Set getPermissions() - { + public Set getPermissions() { return permissions; } - public void setPermissions(Set permissions) - { + public void setPermissions(Set permissions) { this.permissions = permissions; } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("roleId", getRoleId()) - .append("roleName", getRoleName()) - .append("roleKey", getRoleKey()) - .append("roleSort", getRoleSort()) - .append("dataScope", getDataScope()) - .append("menuCheckStrictly", isMenuCheckStrictly()) - .append("deptCheckStrictly", isDeptCheckStrictly()) - .append("status", getStatus()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("roleId", getRoleId()) + .append("roleName", getRoleName()) + .append("roleKey", getRoleKey()) + .append("roleSort", getRoleSort()) + .append("dataScope", getDataScope()) + .append("menuCheckStrictly", isMenuCheckStrictly()) + .append("deptCheckStrictly", isDeptCheckStrictly()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index 53ad695..ac171ed 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -1,324 +1,322 @@ package com.ruoyi.common.core.domain.entity; -import java.util.Date; -import java.util.List; -import javax.validation.constraints.*; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel.ColumnType; import com.ruoyi.common.annotation.Excel.Type; import com.ruoyi.common.annotation.Excels; import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.xss.Xss; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.util.Date; +import java.util.List; /** * 鐢ㄦ埛瀵硅薄 sys_user - * + * * @author ruoyi */ -public class SysUser extends BaseEntity -{ +public class SysUser extends BaseEntity { private static final long serialVersionUID = 1L; - /** 鐢ㄦ埛ID */ + /** + * 鐢ㄦ埛ID + */ @Excel(name = "鐢ㄦ埛搴忓彿", cellType = ColumnType.NUMERIC, prompt = "鐢ㄦ埛缂栧彿") private Long userId; - /** 閮ㄩ棬ID */ + /** + * 閮ㄩ棬ID + */ @Excel(name = "閮ㄩ棬缂栧彿", type = Type.IMPORT) private Long deptId; - /** 鐢ㄦ埛璐﹀彿 */ + /** + * 鐢ㄦ埛璐﹀彿 + */ @Excel(name = "鐧诲綍鍚嶇О") private String userName; - /** 鐢ㄦ埛鏄电О */ + /** + * 鐢ㄦ埛鏄电О + */ @Excel(name = "鐢ㄦ埛鍚嶇О") private String nickName; - /** 鐢ㄦ埛閭 */ + /** + * 鐢ㄦ埛閭 + */ @Excel(name = "鐢ㄦ埛閭") private String email; - /** 鎵嬫満鍙风爜 */ + /** + * 鎵嬫満鍙风爜 + */ @Excel(name = "鎵嬫満鍙风爜") private String phonenumber; - /** 鐢ㄦ埛鎬у埆 */ + /** + * 鐢ㄦ埛鎬у埆 + */ @Excel(name = "鐢ㄦ埛鎬у埆", readConverterExp = "0=鐢,1=濂,2=鏈煡") private String sex; - /** 鐢ㄦ埛澶村儚 */ + /** + * 鐢ㄦ埛澶村儚 + */ private String avatar; - /** 瀵嗙爜 */ + /** + * 瀵嗙爜 + */ private String password; - /** 甯愬彿鐘舵侊紙0姝e父 1鍋滅敤锛 */ + /** + * 甯愬彿鐘舵侊紙0姝e父 1鍋滅敤锛 + */ @Excel(name = "甯愬彿鐘舵", readConverterExp = "0=姝e父,1=鍋滅敤") private String status; - /** 鍒犻櫎鏍囧織锛0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛 */ + /** + * 鍒犻櫎鏍囧織锛0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛 + */ private String delFlag; - /** 鏈鍚庣櫥褰旾P */ + /** + * 鏈鍚庣櫥褰旾P + */ @Excel(name = "鏈鍚庣櫥褰旾P", type = Type.EXPORT) private String loginIp; - /** 鏈鍚庣櫥褰曟椂闂 */ + /** + * 鏈鍚庣櫥褰曟椂闂 + */ @Excel(name = "鏈鍚庣櫥褰曟椂闂", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT) private Date loginDate; - /** 閮ㄩ棬瀵硅薄 */ + /** + * 閮ㄩ棬瀵硅薄 + */ @Excels({ - @Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT), - @Excel(name = "閮ㄩ棬璐熻矗浜", targetAttr = "leader", type = Type.EXPORT) + @Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT), + @Excel(name = "閮ㄩ棬璐熻矗浜", targetAttr = "leader", type = Type.EXPORT) }) private SysDept dept; - /** 瑙掕壊瀵硅薄 */ + /** + * 瑙掕壊瀵硅薄 + */ private List roles; - /** 瑙掕壊缁 */ + /** + * 瑙掕壊缁 + */ private Long[] roleIds; - /** 宀椾綅缁 */ + /** + * 宀椾綅缁 + */ private Long[] postIds; - /** 瑙掕壊ID */ + /** + * 瑙掕壊ID + */ private Long roleId; - public SysUser() - { + public SysUser() { } - public SysUser(Long userId) - { + public SysUser(Long userId) { this.userId = userId; } - public Long getUserId() - { + public static boolean isAdmin(Long userId) { + return userId != null && 1L == userId; + } + + public Long getUserId() { return userId; } - public void setUserId(Long userId) - { + public void setUserId(Long userId) { this.userId = userId; } - public boolean isAdmin() - { + public boolean isAdmin() { return isAdmin(this.userId); } - public static boolean isAdmin(Long userId) - { - return userId != null && 1L == userId; - } - - public Long getDeptId() - { + public Long getDeptId() { return deptId; } - public void setDeptId(Long deptId) - { + public void setDeptId(Long deptId) { this.deptId = deptId; } @Xss(message = "鐢ㄦ埛鏄电О涓嶈兘鍖呭惈鑴氭湰瀛楃") @Size(min = 0, max = 30, message = "鐢ㄦ埛鏄电О闀垮害涓嶈兘瓒呰繃30涓瓧绗") - public String getNickName() - { + public String getNickName() { return nickName; } - public void setNickName(String nickName) - { + public void setNickName(String nickName) { this.nickName = nickName; } @Xss(message = "鐢ㄦ埛璐﹀彿涓嶈兘鍖呭惈鑴氭湰瀛楃") @NotBlank(message = "鐢ㄦ埛璐﹀彿涓嶈兘涓虹┖") @Size(min = 0, max = 30, message = "鐢ㄦ埛璐﹀彿闀垮害涓嶈兘瓒呰繃30涓瓧绗") - public String getUserName() - { + public String getUserName() { return userName; } - public void setUserName(String userName) - { + public void setUserName(String userName) { this.userName = userName; } @Email(message = "閭鏍煎紡涓嶆纭") @Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗") - public String getEmail() - { + public String getEmail() { return email; } - public void setEmail(String email) - { + public void setEmail(String email) { this.email = email; } @Size(min = 0, max = 11, message = "鎵嬫満鍙风爜闀垮害涓嶈兘瓒呰繃11涓瓧绗") - public String getPhonenumber() - { + public String getPhonenumber() { return phonenumber; } - public void setPhonenumber(String phonenumber) - { + public void setPhonenumber(String phonenumber) { this.phonenumber = phonenumber; } - public String getSex() - { + public String getSex() { return sex; } - public void setSex(String sex) - { + public void setSex(String sex) { this.sex = sex; } - public String getAvatar() - { + public String getAvatar() { return avatar; } - public void setAvatar(String avatar) - { + public void setAvatar(String avatar) { this.avatar = avatar; } - public String getPassword() - { + public String getPassword() { return password; } - public void setPassword(String password) - { + public void setPassword(String password) { this.password = password; } - public String getStatus() - { + public String getStatus() { return status; } - public void setStatus(String status) - { + public void setStatus(String status) { this.status = status; } - public String getDelFlag() - { + public String getDelFlag() { return delFlag; } - public void setDelFlag(String delFlag) - { + public void setDelFlag(String delFlag) { this.delFlag = delFlag; } - public String getLoginIp() - { + public String getLoginIp() { return loginIp; } - public void setLoginIp(String loginIp) - { + public void setLoginIp(String loginIp) { this.loginIp = loginIp; } - public Date getLoginDate() - { + public Date getLoginDate() { return loginDate; } - public void setLoginDate(Date loginDate) - { + public void setLoginDate(Date loginDate) { this.loginDate = loginDate; } - public SysDept getDept() - { + public SysDept getDept() { return dept; } - public void setDept(SysDept dept) - { + public void setDept(SysDept dept) { this.dept = dept; } - public List getRoles() - { + public List getRoles() { return roles; } - public void setRoles(List roles) - { + public void setRoles(List roles) { this.roles = roles; } - public Long[] getRoleIds() - { + public Long[] getRoleIds() { return roleIds; } - public void setRoleIds(Long[] roleIds) - { + public void setRoleIds(Long[] roleIds) { this.roleIds = roleIds; } - public Long[] getPostIds() - { + public Long[] getPostIds() { return postIds; } - public void setPostIds(Long[] postIds) - { + public void setPostIds(Long[] postIds) { this.postIds = postIds; } - public Long getRoleId() - { + public Long getRoleId() { return roleId; } - public void setRoleId(Long roleId) - { + public void setRoleId(Long roleId) { this.roleId = roleId; } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("userId", getUserId()) - .append("deptId", getDeptId()) - .append("userName", getUserName()) - .append("nickName", getNickName()) - .append("email", getEmail()) - .append("phonenumber", getPhonenumber()) - .append("sex", getSex()) - .append("avatar", getAvatar()) - .append("password", getPassword()) - .append("status", getStatus()) - .append("delFlag", getDelFlag()) - .append("loginIp", getLoginIp()) - .append("loginDate", getLoginDate()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .append("dept", getDept()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("userId", getUserId()) + .append("deptId", getDeptId()) + .append("userName", getUserName()) + .append("nickName", getNickName()) + .append("email", getEmail()) + .append("phonenumber", getPhonenumber()) + .append("sex", getSex()) + .append("avatar", getAvatar()) + .append("password", getPassword()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("loginIp", getLoginIp()) + .append("loginDate", getLoginDate()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .append("dept", getDept()) + .toString(); } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java index ed4cbc9..0d63c12 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java @@ -1,5 +1,15 @@ package com.ruoyi.common.utils.file; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.uuid.IdUtils; +import org.apache.commons.io.FilenameUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.ArrayUtils; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -9,56 +19,38 @@ import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.ArrayUtils; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.uuid.IdUtils; -import org.apache.commons.io.FilenameUtils; /** * 鏂囦欢澶勭悊宸ュ叿绫 - * + * * @author ruoyi */ -public class FileUtils -{ +public class FileUtils { public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+"; /** * 杈撳嚭鎸囧畾鏂囦欢鐨刡yte鏁扮粍 - * + * * @param filePath 鏂囦欢璺緞 - * @param os 杈撳嚭娴 + * @param os 杈撳嚭娴 * @return */ - public static void writeBytes(String filePath, OutputStream os) throws IOException - { + public static void writeBytes(String filePath, OutputStream os) throws IOException { FileInputStream fis = null; - try - { + try { File file = new File(filePath); - if (!file.exists()) - { + if (!file.exists()) { throw new FileNotFoundException(filePath); } fis = new FileInputStream(file); byte[] b = new byte[1024]; int length; - while ((length = fis.read(b)) > 0) - { + while ((length = fis.read(b)) > 0) { os.write(b, 0, length); } - } - catch (IOException e) - { + } catch (IOException e) { throw e; - } - finally - { + } finally { IOUtils.close(os); IOUtils.close(fis); } @@ -71,33 +63,28 @@ public class FileUtils * @return 鐩爣鏂囦欢 * @throws IOException IO寮傚父 */ - public static String writeImportBytes(byte[] data) throws IOException - { + public static String writeImportBytes(byte[] data) throws IOException { return writeBytes(data, RuoYiConfig.getImportPath()); } /** * 鍐欐暟鎹埌鏂囦欢涓 * - * @param data 鏁版嵁 + * @param data 鏁版嵁 * @param uploadDir 鐩爣鏂囦欢 * @return 鐩爣鏂囦欢 * @throws IOException IO寮傚父 */ - public static String writeBytes(byte[] data, String uploadDir) throws IOException - { + public static String writeBytes(byte[] data, String uploadDir) throws IOException { FileOutputStream fos = null; String pathName = ""; - try - { + try { String extension = getFileExtendName(data); pathName = DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension; File file = FileUploadUtils.getAbsoluteFile(uploadDir, pathName); fos = new FileOutputStream(file); fos.write(data); - } - finally - { + } finally { IOUtils.close(fos); } return FileUploadUtils.getPathFileName(uploadDir, pathName); @@ -105,17 +92,15 @@ public class FileUtils /** * 鍒犻櫎鏂囦欢 - * + * * @param filePath 鏂囦欢 * @return */ - public static boolean deleteFile(String filePath) - { + public static boolean deleteFile(String filePath) { boolean flag = false; File file = new File(filePath); // 璺緞涓烘枃浠朵笖涓嶄负绌哄垯杩涜鍒犻櫎 - if (file.isFile() && file.exists()) - { + if (file.isFile() && file.exists()) { flag = file.delete(); } return flag; @@ -123,32 +108,28 @@ public class FileUtils /** * 鏂囦欢鍚嶇О楠岃瘉 - * + * * @param filename 鏂囦欢鍚嶇О * @return true 姝e父 false 闈炴硶 */ - public static boolean isValidFilename(String filename) - { + public static boolean isValidFilename(String filename) { return filename.matches(FILENAME_PATTERN); } /** * 妫鏌ユ枃浠舵槸鍚﹀彲涓嬭浇 - * + * * @param resource 闇瑕佷笅杞界殑鏂囦欢 * @return true 姝e父 false 闈炴硶 */ - public static boolean checkAllowDownload(String resource) - { + public static boolean checkAllowDownload(String resource) { // 绂佹鐩綍涓婅烦绾у埆 - if (StringUtils.contains(resource, "..")) - { + if (StringUtils.contains(resource, "..")) { return false; } // 妫鏌ュ厑璁镐笅杞界殑鏂囦欢瑙勫垯 - if (ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource))) - { + if (ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource))) { return true; } @@ -158,33 +139,25 @@ public class FileUtils /** * 涓嬭浇鏂囦欢鍚嶉噸鏂扮紪鐮 - * - * @param request 璇锋眰瀵硅薄 + * + * @param request 璇锋眰瀵硅薄 * @param fileName 鏂囦欢鍚 * @return 缂栫爜鍚庣殑鏂囦欢鍚 */ - public static String setFileDownloadHeader(HttpServletRequest request, String fileName) throws UnsupportedEncodingException - { + public static String setFileDownloadHeader(HttpServletRequest request, String fileName) throws UnsupportedEncodingException { final String agent = request.getHeader("USER-AGENT"); String filename = fileName; - if (agent.contains("MSIE")) - { + if (agent.contains("MSIE")) { // IE娴忚鍣 filename = URLEncoder.encode(filename, "utf-8"); filename = filename.replace("+", " "); - } - else if (agent.contains("Firefox")) - { + } else if (agent.contains("Firefox")) { // 鐏嫄娴忚鍣 filename = new String(fileName.getBytes(), "ISO8859-1"); - } - else if (agent.contains("Chrome")) - { + } else if (agent.contains("Chrome")) { // google娴忚鍣 filename = URLEncoder.encode(filename, "utf-8"); - } - else - { + } else { // 鍏跺畠娴忚鍣 filename = URLEncoder.encode(filename, "utf-8"); } @@ -194,11 +167,10 @@ public class FileUtils /** * 涓嬭浇鏂囦欢鍚嶉噸鏂扮紪鐮 * - * @param response 鍝嶅簲瀵硅薄 + * @param response 鍝嶅簲瀵硅薄 * @param realFileName 鐪熷疄鏂囦欢鍚 */ - public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) throws UnsupportedEncodingException - { + public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) throws UnsupportedEncodingException { String percentEncodedFileName = percentEncode(realFileName); StringBuilder contentDispositionValue = new StringBuilder(); @@ -220,36 +192,27 @@ public class FileUtils * @param s 闇瑕佺櫨鍒嗗彿缂栫爜鐨勫瓧绗︿覆 * @return 鐧惧垎鍙风紪鐮佸悗鐨勫瓧绗︿覆 */ - public static String percentEncode(String s) throws UnsupportedEncodingException - { + public static String percentEncode(String s) throws UnsupportedEncodingException { String encode = URLEncoder.encode(s, StandardCharsets.UTF_8.toString()); return encode.replaceAll("\\+", "%20"); } /** * 鑾峰彇鍥惧儚鍚庣紑 - * + * * @param photoByte 鍥惧儚鏁版嵁 * @return 鍚庣紑鍚 */ - public static String getFileExtendName(byte[] photoByte) - { + public static String getFileExtendName(byte[] photoByte) { String strFileExtendName = "jpg"; if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56) - && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97)) - { + && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97)) { strFileExtendName = "gif"; - } - else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70)) - { + } else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70)) { strFileExtendName = "jpg"; - } - else if ((photoByte[0] == 66) && (photoByte[1] == 77)) - { + } else if ((photoByte[0] == 66) && (photoByte[1] == 77)) { strFileExtendName = "bmp"; - } - else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71)) - { + } else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71)) { strFileExtendName = "png"; } return strFileExtendName; @@ -257,14 +220,12 @@ public class FileUtils /** * 鑾峰彇鏂囦欢鍚嶇О /profile/upload/2022/04/16/ruoyi.png -- ruoyi.png - * + * * @param fileName 璺緞鍚嶇О * @return 娌℃湁鏂囦欢璺緞鐨勫悕绉 */ - public static String getName(String fileName) - { - if (fileName == null) - { + public static String getName(String fileName) { + if (fileName == null) { return null; } int lastUnixPos = fileName.lastIndexOf('/'); @@ -275,17 +236,64 @@ public class FileUtils /** * 鑾峰彇涓嶅甫鍚庣紑鏂囦欢鍚嶇О /profile/upload/2022/04/16/ruoyi.png -- ruoyi - * + * * @param fileName 璺緞鍚嶇О * @return 娌℃湁鏂囦欢璺緞鍜屽悗缂鐨勫悕绉 */ - public static String getNameNotSuffix(String fileName) - { - if (fileName == null) - { + public static String getNameNotSuffix(String fileName) { + if (fileName == null) { return null; } - String baseName = FilenameUtils.getBaseName(fileName); - return baseName; + return FilenameUtils.getBaseName(fileName); + } + + /** + * 涓嬭浇鏂囦欢 + * + * @param response + * @param request + * @param filename + * @param fileData + * @return {@link boolean} + * @author emiya.xie + * @create 2023/8/31 10:49 + */ + public static boolean downloadFile(HttpServletResponse response, + HttpServletRequest request, String filename, byte[] fileData) { + try { + OutputStream myout = null; + // 妫鏌ユ椂鍊欒幏鍙栧埌鏁版嵁 + if (fileData == null) { + response.sendError(404); + return false; + } + try { + if (request.getHeader("User-Agent").toUpperCase().indexOf("MSIE") > 0) { + filename = new String(filename.getBytes("GBK"), "iso-8859-1"); + } else { + filename = URLEncoder.encode(filename, "utf-8"); + } + response.setContentType("multipart/form-data"); + /*response.setContentType("multipart/form-data;charset=utf-8");*/ + response.setHeader("content-disposition", "attachment;filename=" + filename); + // 鍐欐槑瑕佷笅杞界殑鏂囦欢鐨勫ぇ灏 + response.setContentLength(fileData.length); + // 浠巖esponse瀵硅薄涓緱鍒拌緭鍑烘祦,鍑嗗涓嬭浇 + myout = response.getOutputStream(); + myout.write(fileData); + myout.flush(); + } catch (Exception ignored) { + } finally { + if (myout != null) { + try { + myout.close(); + } catch (Exception ignored) { + } + } + } + } catch (IOException e) { + return false; + } + return true; } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ProjectExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ProjectExcelUtil.java index 6dea51e..43bb75a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ProjectExcelUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ProjectExcelUtil.java @@ -19,20 +19,55 @@ import com.ruoyi.common.utils.reflect.ReflectUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.RegExUtils; import org.apache.commons.lang3.reflect.FieldUtils; -import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.hssf.usermodel.HSSFClientAnchor; +import org.apache.poi.hssf.usermodel.HSSFPicture; +import org.apache.poi.hssf.usermodel.HSSFPictureData; +import org.apache.poi.hssf.usermodel.HSSFShape; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ooxml.POIXMLDocumentPart; -import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.usermodel.BorderStyle; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.CellType; +import org.apache.poi.ss.usermodel.ClientAnchor; +import org.apache.poi.ss.usermodel.DataValidation; +import org.apache.poi.ss.usermodel.DataValidationConstraint; +import org.apache.poi.ss.usermodel.DataValidationHelper; +import org.apache.poi.ss.usermodel.DateUtil; +import org.apache.poi.ss.usermodel.Drawing; +import org.apache.poi.ss.usermodel.FillPatternType; +import org.apache.poi.ss.usermodel.Font; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.usermodel.IndexedColors; +import org.apache.poi.ss.usermodel.Name; +import org.apache.poi.ss.usermodel.PictureData; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.VerticalAlignment; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.WorkbookFactory; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.ss.util.CellRangeAddressList; import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.streaming.SXSSFWorkbook; -import org.apache.poi.xssf.usermodel.*; +import org.apache.poi.xssf.usermodel.XSSFClientAnchor; +import org.apache.poi.xssf.usermodel.XSSFDataValidation; +import org.apache.poi.xssf.usermodel.XSSFDrawing; +import org.apache.poi.xssf.usermodel.XSSFPicture; +import org.apache.poi.xssf.usermodel.XSSFShape; +import org.apache.poi.xssf.usermodel.XSSFSheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.servlet.http.HttpServletResponse; -import java.io.*; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; @@ -40,7 +75,18 @@ import java.math.BigDecimal; import java.text.DecimalFormat; import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.UUID; import java.util.stream.Collectors; /** @@ -49,114 +95,238 @@ import java.util.stream.Collectors; * @author ruoyi */ public class ProjectExcelUtil { - private static final Logger log = LoggerFactory.getLogger(ProjectExcelUtil.class); - public static final String FORMULA_REGEX_STR = "=|-|\\+|@"; - public static final String[] FORMULA_STR = {"=", "-", "+", "@"}; - + /** + * Excel sheet鏈澶ц鏁帮紝榛樿65536 + */ + public static final int sheetSize = 65536; + private static final Logger log = LoggerFactory.getLogger(ProjectExcelUtil.class); + /** + * 鏁板瓧鏍煎紡 + */ + private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00"); /** * 鐢ㄤ簬dictType灞炴ф暟鎹瓨鍌紝閬垮厤閲嶅鏌ョ紦瀛 */ public Map sysDictMap = new HashMap(); - /** - * Excel sheet鏈澶ц鏁帮紝榛樿65536 + * 瀹炰綋瀵硅薄 */ - public static final int sheetSize = 65536; - + public Class clazz; + /** + * 闇瑕佹帓闄ゅ垪灞炴 + */ + public String[] excludeFields; /** * 宸ヤ綔琛ㄥ悕绉 */ private String sheetName; - /** * 瀵煎嚭绫诲瀷锛圗XPORT:瀵煎嚭鏁版嵁锛汭MPORT锛氬鍏ユā鏉匡級 */ private Type type; - /** * 宸ヤ綔钖勫璞 */ private Workbook wb; - /** * 宸ヤ綔琛ㄥ璞 */ private Sheet sheet; - /** * 鏍峰紡鍒楄〃 */ private Map styles; - /** * 瀵煎叆瀵煎嚭鏁版嵁鍒楄〃 */ private List list; - /** * 娉ㄨВ鍒楄〃 */ private List fields; - /** * 褰撳墠琛屽彿 */ private int rownum; - /** * 鏍囬 */ private String title; - /** * 鏈澶ч珮搴 */ private short maxHeight; - /** * 鍚堝苟鍚庢渶鍚庤鏁 */ private int subMergedLastRowNum = 0; - /** * 鍚堝苟鍚庡紑濮嬭鏁 */ private int subMergedFirstRowNum = 1; - /** * 瀵硅薄鐨勫瓙鍒楄〃鏂规硶 */ private Method subMethod; - /** * 瀵硅薄鐨勫瓙鍒楄〃灞炴 */ private List subFields; - /** * 缁熻鍒楄〃 */ private Map statistics = new HashMap(); + public ProjectExcelUtil(Class clazz) { + this.clazz = clazz; + } + /** - * 鏁板瓧鏍煎紡 + * 鑾峰彇鐢诲竷 */ - private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00"); + public static Drawing getDrawingPatriarch(Sheet sheet) { + if (sheet.getDrawingPatriarch() == null) { + sheet.createDrawingPatriarch(); + } + return sheet.getDrawingPatriarch(); + } /** - * 瀹炰綋瀵硅薄 + * 瑙f瀽瀵煎嚭鍊 0=鐢,1=濂,2=鏈煡 + * + * @param propertyValue 鍙傛暟鍊 + * @param converterExp 缈昏瘧娉ㄨВ + * @param separator 鍒嗛殧绗 + * @return 瑙f瀽鍚庡 */ - public Class clazz; + public static String convertByExp(String propertyValue, String converterExp, String separator) { + StringBuilder propertyString = new StringBuilder(); + String[] convertSource = converterExp.split(","); + for (String item : convertSource) { + String[] itemArray = item.split("="); + if (StringUtils.containsAny(propertyValue, separator)) { + for (String value : propertyValue.split(separator)) { + if (itemArray[0].equals(value)) { + propertyString.append(itemArray[1] + separator); + break; + } + } + } else { + if (itemArray[0].equals(propertyValue)) { + return itemArray[1]; + } + } + } + return StringUtils.stripEnd(propertyString.toString(), separator); + } /** - * 闇瑕佹帓闄ゅ垪灞炴 + * 鍙嶅悜瑙f瀽鍊 鐢=0,濂=1,鏈煡=2 + * + * @param propertyValue 鍙傛暟鍊 + * @param converterExp 缈昏瘧娉ㄨВ + * @param separator 鍒嗛殧绗 + * @return 瑙f瀽鍚庡 */ - public String[] excludeFields; + public static String reverseByExp(String propertyValue, String converterExp, String separator) { + StringBuilder propertyString = new StringBuilder(); + String[] convertSource = converterExp.split(","); + for (String item : convertSource) { + String[] itemArray = item.split("="); + if (StringUtils.containsAny(propertyValue, separator)) { + for (String value : propertyValue.split(separator)) { + if (itemArray[1].equals(value)) { + propertyString.append(itemArray[0] + separator); + break; + } + } + } else { + if (itemArray[1].equals(propertyValue)) { + return itemArray[0]; + } + } + } + return StringUtils.stripEnd(propertyString.toString(), separator); + } - public ProjectExcelUtil(Class clazz) { - this.clazz = clazz; + /** + * 瑙f瀽瀛楀吀鍊 + * + * @param dictValue 瀛楀吀鍊 + * @param dictType 瀛楀吀绫诲瀷 + * @param separator 鍒嗛殧绗 + * @return 瀛楀吀鏍囩 + */ + public static String convertDictByExp(String dictValue, String dictType, String separator) { + return DictUtils.getDictLabel(dictType, dictValue, separator); + } + + /** + * 鍙嶅悜瑙f瀽鍊煎瓧鍏稿 + * + * @param dictLabel 瀛楀吀鏍囩 + * @param dictType 瀛楀吀绫诲瀷 + * @param separator 鍒嗛殧绗 + * @return 瀛楀吀鍊 + */ + public static String reverseDictByExp(String dictLabel, String dictType, String separator) { + return DictUtils.getDictValue(dictType, dictLabel, separator); + } + + /** + * 鑾峰彇Excel2003鍥剧墖 + * + * @param sheet 褰撳墠sheet瀵硅薄 + * @param workbook 宸ヤ綔绨垮璞 + * @return Map key:鍥剧墖鍗曞厓鏍肩储寮曪紙1_1锛塖tring锛寁alue:鍥剧墖娴丳ictureData + */ + public static Map getSheetPictures03(HSSFSheet sheet, HSSFWorkbook workbook) { + Map sheetIndexPicMap = new HashMap(); + List pictures = workbook.getAllPictures(); + if (!pictures.isEmpty()) { + for (HSSFShape shape : sheet.getDrawingPatriarch().getChildren()) { + HSSFClientAnchor anchor = (HSSFClientAnchor) shape.getAnchor(); + if (shape instanceof HSSFPicture) { + HSSFPicture pic = (HSSFPicture) shape; + int pictureIndex = pic.getPictureIndex() - 1; + HSSFPictureData picData = pictures.get(pictureIndex); + String picIndex = anchor.getRow1() + "_" + anchor.getCol1(); + sheetIndexPicMap.put(picIndex, picData); + } + } + return sheetIndexPicMap; + } else { + return sheetIndexPicMap; + } + } + + /** + * 鑾峰彇Excel2007鍥剧墖 + * + * @param sheet 褰撳墠sheet瀵硅薄 + * @param workbook 宸ヤ綔绨垮璞 + * @return Map key:鍥剧墖鍗曞厓鏍肩储寮曪紙1_1锛塖tring锛寁alue:鍥剧墖娴丳ictureData + */ + public static Map getSheetPictures07(XSSFSheet sheet, XSSFWorkbook workbook) { + Map sheetIndexPicMap = new HashMap(); + for (POIXMLDocumentPart dr : sheet.getRelations()) { + if (dr instanceof XSSFDrawing) { + XSSFDrawing drawing = (XSSFDrawing) dr; + List shapes = drawing.getShapes(); + for (XSSFShape shape : shapes) { + if (shape instanceof XSSFPicture) { + XSSFPicture pic = (XSSFPicture) shape; + XSSFClientAnchor anchor = pic.getPreferredSize(); + CTMarker ctMarker = anchor.getFrom(); + String picIndex = ctMarker.getRow() + "_" + ctMarker.getCol(); + sheetIndexPicMap.put(picIndex, pic.getPictureData()); + } + } + } + } + return sheetIndexPicMap; } /** @@ -388,7 +558,7 @@ public class ProjectExcelUtil { ReflectUtils.invokeSetter(entity, "status", 5); cellMap.entrySet().removeIf(entry -> hasStr.contains(entry.getKey())); StringBuilder str = new StringBuilder(); - Map sortHash = new HashMap<>(); + Map sortHash = new HashMap<>(); str.append("{"); for (Map.Entry entry : cellMap.entrySet()) { String key1 = entry.getKey(); @@ -430,7 +600,6 @@ public class ProjectExcelUtil { return list; } - /** * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟 * @@ -827,16 +996,6 @@ public class ProjectExcelUtil { } } - /** - * 鑾峰彇鐢诲竷 - */ - public static Drawing getDrawingPatriarch(Sheet sheet) { - if (sheet.getDrawingPatriarch() == null) { - sheet.createDrawingPatriarch(); - } - return sheet.getDrawingPatriarch(); - } - /** * 鑾峰彇鍥剧墖绫诲瀷,璁剧疆鍥剧墖鎻掑叆绫诲瀷 */ @@ -999,88 +1158,6 @@ public class ProjectExcelUtil { wb.setSheetHidden(wb.getSheetIndex(hideSheet), true); } - /** - * 瑙f瀽瀵煎嚭鍊 0=鐢,1=濂,2=鏈煡 - * - * @param propertyValue 鍙傛暟鍊 - * @param converterExp 缈昏瘧娉ㄨВ - * @param separator 鍒嗛殧绗 - * @return 瑙f瀽鍚庡 - */ - public static String convertByExp(String propertyValue, String converterExp, String separator) { - StringBuilder propertyString = new StringBuilder(); - String[] convertSource = converterExp.split(","); - for (String item : convertSource) { - String[] itemArray = item.split("="); - if (StringUtils.containsAny(propertyValue, separator)) { - for (String value : propertyValue.split(separator)) { - if (itemArray[0].equals(value)) { - propertyString.append(itemArray[1] + separator); - break; - } - } - } else { - if (itemArray[0].equals(propertyValue)) { - return itemArray[1]; - } - } - } - return StringUtils.stripEnd(propertyString.toString(), separator); - } - - /** - * 鍙嶅悜瑙f瀽鍊 鐢=0,濂=1,鏈煡=2 - * - * @param propertyValue 鍙傛暟鍊 - * @param converterExp 缈昏瘧娉ㄨВ - * @param separator 鍒嗛殧绗 - * @return 瑙f瀽鍚庡 - */ - public static String reverseByExp(String propertyValue, String converterExp, String separator) { - StringBuilder propertyString = new StringBuilder(); - String[] convertSource = converterExp.split(","); - for (String item : convertSource) { - String[] itemArray = item.split("="); - if (StringUtils.containsAny(propertyValue, separator)) { - for (String value : propertyValue.split(separator)) { - if (itemArray[1].equals(value)) { - propertyString.append(itemArray[0] + separator); - break; - } - } - } else { - if (itemArray[1].equals(propertyValue)) { - return itemArray[0]; - } - } - } - return StringUtils.stripEnd(propertyString.toString(), separator); - } - - /** - * 瑙f瀽瀛楀吀鍊 - * - * @param dictValue 瀛楀吀鍊 - * @param dictType 瀛楀吀绫诲瀷 - * @param separator 鍒嗛殧绗 - * @return 瀛楀吀鏍囩 - */ - public static String convertDictByExp(String dictValue, String dictType, String separator) { - return DictUtils.getDictLabel(dictType, dictValue, separator); - } - - /** - * 鍙嶅悜瑙f瀽鍊煎瓧鍏稿 - * - * @param dictLabel 瀛楀吀鏍囩 - * @param dictType 瀛楀吀绫诲瀷 - * @param separator 鍒嗛殧绗 - * @return 瀛楀吀鍊 - */ - public static String reverseDictByExp(String dictLabel, String dictType, String separator) { - return DictUtils.getDictValue(dictType, dictLabel, separator); - } - /** * 鏁版嵁澶勭悊鍣 * @@ -1349,60 +1426,6 @@ public class ProjectExcelUtil { return true; } - /** - * 鑾峰彇Excel2003鍥剧墖 - * - * @param sheet 褰撳墠sheet瀵硅薄 - * @param workbook 宸ヤ綔绨垮璞 - * @return Map key:鍥剧墖鍗曞厓鏍肩储寮曪紙1_1锛塖tring锛寁alue:鍥剧墖娴丳ictureData - */ - public static Map getSheetPictures03(HSSFSheet sheet, HSSFWorkbook workbook) { - Map sheetIndexPicMap = new HashMap(); - List pictures = workbook.getAllPictures(); - if (!pictures.isEmpty()) { - for (HSSFShape shape : sheet.getDrawingPatriarch().getChildren()) { - HSSFClientAnchor anchor = (HSSFClientAnchor) shape.getAnchor(); - if (shape instanceof HSSFPicture) { - HSSFPicture pic = (HSSFPicture) shape; - int pictureIndex = pic.getPictureIndex() - 1; - HSSFPictureData picData = pictures.get(pictureIndex); - String picIndex = anchor.getRow1() + "_" + anchor.getCol1(); - sheetIndexPicMap.put(picIndex, picData); - } - } - return sheetIndexPicMap; - } else { - return sheetIndexPicMap; - } - } - - /** - * 鑾峰彇Excel2007鍥剧墖 - * - * @param sheet 褰撳墠sheet瀵硅薄 - * @param workbook 宸ヤ綔绨垮璞 - * @return Map key:鍥剧墖鍗曞厓鏍肩储寮曪紙1_1锛塖tring锛寁alue:鍥剧墖娴丳ictureData - */ - public static Map getSheetPictures07(XSSFSheet sheet, XSSFWorkbook workbook) { - Map sheetIndexPicMap = new HashMap(); - for (POIXMLDocumentPart dr : sheet.getRelations()) { - if (dr instanceof XSSFDrawing) { - XSSFDrawing drawing = (XSSFDrawing) dr; - List shapes = drawing.getShapes(); - for (XSSFShape shape : shapes) { - if (shape instanceof XSSFPicture) { - XSSFPicture pic = (XSSFPicture) shape; - XSSFClientAnchor anchor = pic.getPreferredSize(); - CTMarker ctMarker = anchor.getFrom(); - String picIndex = ctMarker.getRow() + "_" + ctMarker.getCol(); - sheetIndexPicMap.put(picIndex, pic.getPictureData()); - } - } - } - } - return sheetIndexPicMap; - } - /** * 鏍煎紡鍖栦笉鍚岀被鍨嬬殑鏃ユ湡瀵硅薄 * diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ProjectValueUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ProjectValueUtil.java index 40f494b..b798d82 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ProjectValueUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ProjectValueUtil.java @@ -7,7 +7,6 @@ import com.ruoyi.common.annotation.Excels; import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.UtilException; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DictUtils; @@ -19,20 +18,55 @@ import com.ruoyi.common.utils.reflect.ReflectUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.RegExUtils; import org.apache.commons.lang3.reflect.FieldUtils; -import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.hssf.usermodel.HSSFClientAnchor; +import org.apache.poi.hssf.usermodel.HSSFPicture; +import org.apache.poi.hssf.usermodel.HSSFPictureData; +import org.apache.poi.hssf.usermodel.HSSFShape; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ooxml.POIXMLDocumentPart; -import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.usermodel.BorderStyle; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.CellType; +import org.apache.poi.ss.usermodel.ClientAnchor; +import org.apache.poi.ss.usermodel.DataValidation; +import org.apache.poi.ss.usermodel.DataValidationConstraint; +import org.apache.poi.ss.usermodel.DataValidationHelper; +import org.apache.poi.ss.usermodel.DateUtil; +import org.apache.poi.ss.usermodel.Drawing; +import org.apache.poi.ss.usermodel.FillPatternType; +import org.apache.poi.ss.usermodel.Font; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.usermodel.IndexedColors; +import org.apache.poi.ss.usermodel.Name; +import org.apache.poi.ss.usermodel.PictureData; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.VerticalAlignment; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.WorkbookFactory; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.ss.util.CellRangeAddressList; import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.streaming.SXSSFWorkbook; -import org.apache.poi.xssf.usermodel.*; +import org.apache.poi.xssf.usermodel.XSSFClientAnchor; +import org.apache.poi.xssf.usermodel.XSSFDataValidation; +import org.apache.poi.xssf.usermodel.XSSFDrawing; +import org.apache.poi.xssf.usermodel.XSSFPicture; +import org.apache.poi.xssf.usermodel.XSSFShape; +import org.apache.poi.xssf.usermodel.XSSFSheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.servlet.http.HttpServletResponse; -import java.io.*; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; @@ -40,7 +74,18 @@ import java.math.BigDecimal; import java.text.DecimalFormat; import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.UUID; import java.util.stream.Collectors; /** @@ -49,114 +94,238 @@ import java.util.stream.Collectors; * @author ruoyi */ public class ProjectValueUtil { - private static final Logger log = LoggerFactory.getLogger(ProjectValueUtil.class); - public static final String FORMULA_REGEX_STR = "=|-|\\+|@"; - public static final String[] FORMULA_STR = {"=", "-", "+", "@"}; - + /** + * Excel sheet鏈澶ц鏁帮紝榛樿65536 + */ + public static final int sheetSize = 65536; + private static final Logger log = LoggerFactory.getLogger(ProjectValueUtil.class); + /** + * 鏁板瓧鏍煎紡 + */ + private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00"); /** * 鐢ㄤ簬dictType灞炴ф暟鎹瓨鍌紝閬垮厤閲嶅鏌ョ紦瀛 */ public Map sysDictMap = new HashMap(); - /** - * Excel sheet鏈澶ц鏁帮紝榛樿65536 + * 瀹炰綋瀵硅薄 */ - public static final int sheetSize = 65536; - + public Class clazz; + /** + * 闇瑕佹帓闄ゅ垪灞炴 + */ + public String[] excludeFields; /** * 宸ヤ綔琛ㄥ悕绉 */ private String sheetName; - /** * 瀵煎嚭绫诲瀷锛圗XPORT:瀵煎嚭鏁版嵁锛汭MPORT锛氬鍏ユā鏉匡級 */ private Type type; - /** * 宸ヤ綔钖勫璞 */ private Workbook wb; - /** * 宸ヤ綔琛ㄥ璞 */ private Sheet sheet; - /** * 鏍峰紡鍒楄〃 */ private Map styles; - /** * 瀵煎叆瀵煎嚭鏁版嵁鍒楄〃 */ private List list; - /** * 娉ㄨВ鍒楄〃 */ private List fields; - /** * 褰撳墠琛屽彿 */ private int rownum; - /** * 鏍囬 */ private String title; - /** * 鏈澶ч珮搴 */ private short maxHeight; - /** * 鍚堝苟鍚庢渶鍚庤鏁 */ private int subMergedLastRowNum = 0; - /** * 鍚堝苟鍚庡紑濮嬭鏁 */ private int subMergedFirstRowNum = 1; - /** * 瀵硅薄鐨勫瓙鍒楄〃鏂规硶 */ private Method subMethod; - /** * 瀵硅薄鐨勫瓙鍒楄〃灞炴 */ private List subFields; - /** * 缁熻鍒楄〃 */ private Map statistics = new HashMap(); + public ProjectValueUtil(Class clazz) { + this.clazz = clazz; + } + /** - * 鏁板瓧鏍煎紡 + * 鑾峰彇鐢诲竷 */ - private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00"); + public static Drawing getDrawingPatriarch(Sheet sheet) { + if (sheet.getDrawingPatriarch() == null) { + sheet.createDrawingPatriarch(); + } + return sheet.getDrawingPatriarch(); + } /** - * 瀹炰綋瀵硅薄 + * 瑙f瀽瀵煎嚭鍊 0=鐢,1=濂,2=鏈煡 + * + * @param propertyValue 鍙傛暟鍊 + * @param converterExp 缈昏瘧娉ㄨВ + * @param separator 鍒嗛殧绗 + * @return 瑙f瀽鍚庡 */ - public Class clazz; + public static String convertByExp(String propertyValue, String converterExp, String separator) { + StringBuilder propertyString = new StringBuilder(); + String[] convertSource = converterExp.split(","); + for (String item : convertSource) { + String[] itemArray = item.split("="); + if (StringUtils.containsAny(propertyValue, separator)) { + for (String value : propertyValue.split(separator)) { + if (itemArray[0].equals(value)) { + propertyString.append(itemArray[1] + separator); + break; + } + } + } else { + if (itemArray[0].equals(propertyValue)) { + return itemArray[1]; + } + } + } + return StringUtils.stripEnd(propertyString.toString(), separator); + } /** - * 闇瑕佹帓闄ゅ垪灞炴 + * 鍙嶅悜瑙f瀽鍊 鐢=0,濂=1,鏈煡=2 + * + * @param propertyValue 鍙傛暟鍊 + * @param converterExp 缈昏瘧娉ㄨВ + * @param separator 鍒嗛殧绗 + * @return 瑙f瀽鍚庡 */ - public String[] excludeFields; + public static String reverseByExp(String propertyValue, String converterExp, String separator) { + StringBuilder propertyString = new StringBuilder(); + String[] convertSource = converterExp.split(","); + for (String item : convertSource) { + String[] itemArray = item.split("="); + if (StringUtils.containsAny(propertyValue, separator)) { + for (String value : propertyValue.split(separator)) { + if (itemArray[1].equals(value)) { + propertyString.append(itemArray[0] + separator); + break; + } + } + } else { + if (itemArray[1].equals(propertyValue)) { + return itemArray[0]; + } + } + } + return StringUtils.stripEnd(propertyString.toString(), separator); + } - public ProjectValueUtil(Class clazz) { - this.clazz = clazz; + /** + * 瑙f瀽瀛楀吀鍊 + * + * @param dictValue 瀛楀吀鍊 + * @param dictType 瀛楀吀绫诲瀷 + * @param separator 鍒嗛殧绗 + * @return 瀛楀吀鏍囩 + */ + public static String convertDictByExp(String dictValue, String dictType, String separator) { + return DictUtils.getDictLabel(dictType, dictValue, separator); + } + + /** + * 鍙嶅悜瑙f瀽鍊煎瓧鍏稿 + * + * @param dictLabel 瀛楀吀鏍囩 + * @param dictType 瀛楀吀绫诲瀷 + * @param separator 鍒嗛殧绗 + * @return 瀛楀吀鍊 + */ + public static String reverseDictByExp(String dictLabel, String dictType, String separator) { + return DictUtils.getDictValue(dictType, dictLabel, separator); + } + + /** + * 鑾峰彇Excel2003鍥剧墖 + * + * @param sheet 褰撳墠sheet瀵硅薄 + * @param workbook 宸ヤ綔绨垮璞 + * @return Map key:鍥剧墖鍗曞厓鏍肩储寮曪紙1_1锛塖tring锛寁alue:鍥剧墖娴丳ictureData + */ + public static Map getSheetPictures03(HSSFSheet sheet, HSSFWorkbook workbook) { + Map sheetIndexPicMap = new HashMap(); + List pictures = workbook.getAllPictures(); + if (!pictures.isEmpty()) { + for (HSSFShape shape : sheet.getDrawingPatriarch().getChildren()) { + HSSFClientAnchor anchor = (HSSFClientAnchor) shape.getAnchor(); + if (shape instanceof HSSFPicture) { + HSSFPicture pic = (HSSFPicture) shape; + int pictureIndex = pic.getPictureIndex() - 1; + HSSFPictureData picData = pictures.get(pictureIndex); + String picIndex = anchor.getRow1() + "_" + anchor.getCol1(); + sheetIndexPicMap.put(picIndex, picData); + } + } + return sheetIndexPicMap; + } else { + return sheetIndexPicMap; + } + } + + /** + * 鑾峰彇Excel2007鍥剧墖 + * + * @param sheet 褰撳墠sheet瀵硅薄 + * @param workbook 宸ヤ綔绨垮璞 + * @return Map key:鍥剧墖鍗曞厓鏍肩储寮曪紙1_1锛塖tring锛寁alue:鍥剧墖娴丳ictureData + */ + public static Map getSheetPictures07(XSSFSheet sheet, XSSFWorkbook workbook) { + Map sheetIndexPicMap = new HashMap(); + for (POIXMLDocumentPart dr : sheet.getRelations()) { + if (dr instanceof XSSFDrawing) { + XSSFDrawing drawing = (XSSFDrawing) dr; + List shapes = drawing.getShapes(); + for (XSSFShape shape : shapes) { + if (shape instanceof XSSFPicture) { + XSSFPicture pic = (XSSFPicture) shape; + XSSFClientAnchor anchor = pic.getPreferredSize(); + CTMarker ctMarker = anchor.getFrom(); + String picIndex = ctMarker.getRow() + "_" + ctMarker.getCol(); + sheetIndexPicMap.put(picIndex, pic.getPictureData()); + } + } + } + } + return sheetIndexPicMap; } /** @@ -234,10 +403,10 @@ public class ProjectValueUtil { * @param is 杈撳叆娴 * @return 杞崲鍚庨泦鍚 */ - public List importExcel(InputStream is,String projectClassify) { + public List importExcel(InputStream is, String projectClassify) { List list = null; try { - list = importExcel(is, 0,projectClassify); + list = importExcel(is, 0, projectClassify); } catch (Exception e) { log.error("瀵煎叆Excel寮傚父{}", e.getMessage()); throw new UtilException(e.getMessage()); @@ -254,8 +423,8 @@ public class ProjectValueUtil { * @param titleNum 鏍囬鍗犵敤琛屾暟 * @return 杞崲鍚庨泦鍚 */ - public List importExcel(InputStream is, int titleNum,String projectClassify) throws Exception { - return importExcel(StringUtils.EMPTY, is, titleNum,projectClassify); + public List importExcel(InputStream is, int titleNum, String projectClassify) throws Exception { + return importExcel(StringUtils.EMPTY, is, titleNum, projectClassify); } /** @@ -266,7 +435,7 @@ public class ProjectValueUtil { * @param is 杈撳叆娴 * @return 杞崲鍚庨泦鍚 */ - public List importExcel(String sheetName, InputStream is, int titleNum,String projectClassify) throws Exception { + public List importExcel(String sheetName, InputStream is, int titleNum, String projectClassify) throws Exception { this.type = Type.IMPORT; this.wb = WorkbookFactory.create(is); List list = new ArrayList(); @@ -386,7 +555,7 @@ public class ProjectValueUtil { ReflectUtils.invokeSetter(entity, "status", 5); cellMap.entrySet().removeIf(entry -> hasStr.contains(entry.getKey())); StringBuilder str = new StringBuilder(); - Map sortHash = new HashMap<>(); + Map sortHash = new HashMap<>(); str.append("{"); for (Map.Entry entry : cellMap.entrySet()) { String key1 = entry.getKey(); @@ -428,7 +597,6 @@ public class ProjectValueUtil { return list; } - /** * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟 * @@ -825,16 +993,6 @@ public class ProjectValueUtil { } } - /** - * 鑾峰彇鐢诲竷 - */ - public static Drawing getDrawingPatriarch(Sheet sheet) { - if (sheet.getDrawingPatriarch() == null) { - sheet.createDrawingPatriarch(); - } - return sheet.getDrawingPatriarch(); - } - /** * 鑾峰彇鍥剧墖绫诲瀷,璁剧疆鍥剧墖鎻掑叆绫诲瀷 */ @@ -997,88 +1155,6 @@ public class ProjectValueUtil { wb.setSheetHidden(wb.getSheetIndex(hideSheet), true); } - /** - * 瑙f瀽瀵煎嚭鍊 0=鐢,1=濂,2=鏈煡 - * - * @param propertyValue 鍙傛暟鍊 - * @param converterExp 缈昏瘧娉ㄨВ - * @param separator 鍒嗛殧绗 - * @return 瑙f瀽鍚庡 - */ - public static String convertByExp(String propertyValue, String converterExp, String separator) { - StringBuilder propertyString = new StringBuilder(); - String[] convertSource = converterExp.split(","); - for (String item : convertSource) { - String[] itemArray = item.split("="); - if (StringUtils.containsAny(propertyValue, separator)) { - for (String value : propertyValue.split(separator)) { - if (itemArray[0].equals(value)) { - propertyString.append(itemArray[1] + separator); - break; - } - } - } else { - if (itemArray[0].equals(propertyValue)) { - return itemArray[1]; - } - } - } - return StringUtils.stripEnd(propertyString.toString(), separator); - } - - /** - * 鍙嶅悜瑙f瀽鍊 鐢=0,濂=1,鏈煡=2 - * - * @param propertyValue 鍙傛暟鍊 - * @param converterExp 缈昏瘧娉ㄨВ - * @param separator 鍒嗛殧绗 - * @return 瑙f瀽鍚庡 - */ - public static String reverseByExp(String propertyValue, String converterExp, String separator) { - StringBuilder propertyString = new StringBuilder(); - String[] convertSource = converterExp.split(","); - for (String item : convertSource) { - String[] itemArray = item.split("="); - if (StringUtils.containsAny(propertyValue, separator)) { - for (String value : propertyValue.split(separator)) { - if (itemArray[1].equals(value)) { - propertyString.append(itemArray[0] + separator); - break; - } - } - } else { - if (itemArray[1].equals(propertyValue)) { - return itemArray[0]; - } - } - } - return StringUtils.stripEnd(propertyString.toString(), separator); - } - - /** - * 瑙f瀽瀛楀吀鍊 - * - * @param dictValue 瀛楀吀鍊 - * @param dictType 瀛楀吀绫诲瀷 - * @param separator 鍒嗛殧绗 - * @return 瀛楀吀鏍囩 - */ - public static String convertDictByExp(String dictValue, String dictType, String separator) { - return DictUtils.getDictLabel(dictType, dictValue, separator); - } - - /** - * 鍙嶅悜瑙f瀽鍊煎瓧鍏稿 - * - * @param dictLabel 瀛楀吀鏍囩 - * @param dictType 瀛楀吀绫诲瀷 - * @param separator 鍒嗛殧绗 - * @return 瀛楀吀鍊 - */ - public static String reverseDictByExp(String dictLabel, String dictType, String separator) { - return DictUtils.getDictValue(dictType, dictLabel, separator); - } - /** * 鏁版嵁澶勭悊鍣 * @@ -1347,60 +1423,6 @@ public class ProjectValueUtil { return true; } - /** - * 鑾峰彇Excel2003鍥剧墖 - * - * @param sheet 褰撳墠sheet瀵硅薄 - * @param workbook 宸ヤ綔绨垮璞 - * @return Map key:鍥剧墖鍗曞厓鏍肩储寮曪紙1_1锛塖tring锛寁alue:鍥剧墖娴丳ictureData - */ - public static Map getSheetPictures03(HSSFSheet sheet, HSSFWorkbook workbook) { - Map sheetIndexPicMap = new HashMap(); - List pictures = workbook.getAllPictures(); - if (!pictures.isEmpty()) { - for (HSSFShape shape : sheet.getDrawingPatriarch().getChildren()) { - HSSFClientAnchor anchor = (HSSFClientAnchor) shape.getAnchor(); - if (shape instanceof HSSFPicture) { - HSSFPicture pic = (HSSFPicture) shape; - int pictureIndex = pic.getPictureIndex() - 1; - HSSFPictureData picData = pictures.get(pictureIndex); - String picIndex = anchor.getRow1() + "_" + anchor.getCol1(); - sheetIndexPicMap.put(picIndex, picData); - } - } - return sheetIndexPicMap; - } else { - return sheetIndexPicMap; - } - } - - /** - * 鑾峰彇Excel2007鍥剧墖 - * - * @param sheet 褰撳墠sheet瀵硅薄 - * @param workbook 宸ヤ綔绨垮璞 - * @return Map key:鍥剧墖鍗曞厓鏍肩储寮曪紙1_1锛塖tring锛寁alue:鍥剧墖娴丳ictureData - */ - public static Map getSheetPictures07(XSSFSheet sheet, XSSFWorkbook workbook) { - Map sheetIndexPicMap = new HashMap(); - for (POIXMLDocumentPart dr : sheet.getRelations()) { - if (dr instanceof XSSFDrawing) { - XSSFDrawing drawing = (XSSFDrawing) dr; - List shapes = drawing.getShapes(); - for (XSSFShape shape : shapes) { - if (shape instanceof XSSFPicture) { - XSSFPicture pic = (XSSFPicture) shape; - XSSFClientAnchor anchor = pic.getPreferredSize(); - CTMarker ctMarker = anchor.getFrom(); - String picIndex = ctMarker.getRow() + "_" + ctMarker.getCol(); - sheetIndexPicMap.put(picIndex, pic.getPictureData()); - } - } - } - } - return sheetIndexPicMap; - } - /** * 鏍煎紡鍖栦笉鍚岀被鍨嬬殑鏃ユ湡瀵硅薄 * diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java index 43e78ae..f748af7 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java @@ -1,23 +1,36 @@ package com.ruoyi.framework.config; -import java.util.Properties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import com.google.code.kaptcha.impl.DefaultKaptcha; import com.google.code.kaptcha.util.Config; -import static com.google.code.kaptcha.Constants.*; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.Properties; + +import static com.google.code.kaptcha.Constants.KAPTCHA_BORDER; +import static com.google.code.kaptcha.Constants.KAPTCHA_BORDER_COLOR; +import static com.google.code.kaptcha.Constants.KAPTCHA_IMAGE_HEIGHT; +import static com.google.code.kaptcha.Constants.KAPTCHA_IMAGE_WIDTH; +import static com.google.code.kaptcha.Constants.KAPTCHA_NOISE_COLOR; +import static com.google.code.kaptcha.Constants.KAPTCHA_NOISE_IMPL; +import static com.google.code.kaptcha.Constants.KAPTCHA_OBSCURIFICATOR_IMPL; +import static com.google.code.kaptcha.Constants.KAPTCHA_SESSION_CONFIG_KEY; +import static com.google.code.kaptcha.Constants.KAPTCHA_TEXTPRODUCER_CHAR_LENGTH; +import static com.google.code.kaptcha.Constants.KAPTCHA_TEXTPRODUCER_CHAR_SPACE; +import static com.google.code.kaptcha.Constants.KAPTCHA_TEXTPRODUCER_FONT_COLOR; +import static com.google.code.kaptcha.Constants.KAPTCHA_TEXTPRODUCER_FONT_NAMES; +import static com.google.code.kaptcha.Constants.KAPTCHA_TEXTPRODUCER_FONT_SIZE; +import static com.google.code.kaptcha.Constants.KAPTCHA_TEXTPRODUCER_IMPL; /** * 楠岃瘉鐮侀厤缃 - * + * * @author ruoyi */ @Configuration -public class CaptchaConfig -{ +public class CaptchaConfig { @Bean(name = "captchaProducer") - public DefaultKaptcha getKaptchaBean() - { + public DefaultKaptcha getKaptchaBean() { DefaultKaptcha defaultKaptcha = new DefaultKaptcha(); Properties properties = new Properties(); // 鏄惁鏈夎竟妗 榛樿涓簍rue 鎴戜滑鍙互鑷繁璁剧疆yes锛宯o @@ -44,8 +57,7 @@ public class CaptchaConfig } @Bean(name = "captchaProducerMath") - public DefaultKaptcha getKaptchaBeanMath() - { + public DefaultKaptcha getKaptchaBeanMath() { DefaultKaptcha defaultKaptcha = new DefaultKaptcha(); Properties properties = new Properties(); // 鏄惁鏈夎竟妗 榛樿涓簍rue 鎴戜滑鍙互鑷繁璁剧疆yes锛宯o diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java index c54678c..21861e8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java @@ -1,111 +1,111 @@ package com.ruoyi.system.domain; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel.ColumnType; import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; /** * 鍙傛暟閰嶇疆琛 sys_config - * + * * @author ruoyi */ -public class SysConfig extends BaseEntity -{ +public class SysConfig extends BaseEntity { private static final long serialVersionUID = 1L; - /** 鍙傛暟涓婚敭 */ + /** + * 鍙傛暟涓婚敭 + */ @Excel(name = "鍙傛暟涓婚敭", cellType = ColumnType.NUMERIC) private Long configId; - /** 鍙傛暟鍚嶇О */ + /** + * 鍙傛暟鍚嶇О + */ @Excel(name = "鍙傛暟鍚嶇О") private String configName; - /** 鍙傛暟閿悕 */ + /** + * 鍙傛暟閿悕 + */ @Excel(name = "鍙傛暟閿悕") private String configKey; - /** 鍙傛暟閿 */ + /** + * 鍙傛暟閿 + */ @Excel(name = "鍙傛暟閿") private String configValue; - /** 绯荤粺鍐呯疆锛圷鏄 N鍚︼級 */ + /** + * 绯荤粺鍐呯疆锛圷鏄 N鍚︼級 + */ @Excel(name = "绯荤粺鍐呯疆", readConverterExp = "Y=鏄,N=鍚") private String configType; - public Long getConfigId() - { + public Long getConfigId() { return configId; } - public void setConfigId(Long configId) - { + public void setConfigId(Long configId) { this.configId = configId; } @NotBlank(message = "鍙傛暟鍚嶇О涓嶈兘涓虹┖") @Size(min = 0, max = 100, message = "鍙傛暟鍚嶇О涓嶈兘瓒呰繃100涓瓧绗") - public String getConfigName() - { + public String getConfigName() { return configName; } - public void setConfigName(String configName) - { + public void setConfigName(String configName) { this.configName = configName; } @NotBlank(message = "鍙傛暟閿悕闀垮害涓嶈兘涓虹┖") @Size(min = 0, max = 100, message = "鍙傛暟閿悕闀垮害涓嶈兘瓒呰繃100涓瓧绗") - public String getConfigKey() - { + public String getConfigKey() { return configKey; } - public void setConfigKey(String configKey) - { + public void setConfigKey(String configKey) { this.configKey = configKey; } @NotBlank(message = "鍙傛暟閿间笉鑳戒负绌") @Size(min = 0, max = 500, message = "鍙傛暟閿奸暱搴︿笉鑳借秴杩500涓瓧绗") - public String getConfigValue() - { + public String getConfigValue() { return configValue; } - public void setConfigValue(String configValue) - { + public void setConfigValue(String configValue) { this.configValue = configValue; } - public String getConfigType() - { + public String getConfigType() { return configType; } - public void setConfigType(String configType) - { + public void setConfigType(String configType) { this.configType = configType; } - + @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("configId", getConfigId()) - .append("configName", getConfigName()) - .append("configKey", getConfigKey()) - .append("configValue", getConfigValue()) - .append("configType", getConfigType()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("configId", getConfigId()) + .append("configName", getConfigName()) + .append("configKey", getConfigKey()) + .append("configValue", getConfigValue()) + .append("configType", getConfigType()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java index 7fdea30..0265f5d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java @@ -1,144 +1,144 @@ package com.ruoyi.system.domain; -import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel.ColumnType; import com.ruoyi.common.core.domain.BaseEntity; +import java.util.Date; + /** * 绯荤粺璁块棶璁板綍琛 sys_logininfor - * + * * @author ruoyi */ -public class SysLogininfor extends BaseEntity -{ +public class SysLogininfor extends BaseEntity { private static final long serialVersionUID = 1L; - /** ID */ + /** + * ID + */ @Excel(name = "搴忓彿", cellType = ColumnType.NUMERIC) private Long infoId; - /** 鐢ㄦ埛璐﹀彿 */ + /** + * 鐢ㄦ埛璐﹀彿 + */ @Excel(name = "鐢ㄦ埛璐﹀彿") private String userName; - /** 鐧诲綍鐘舵 0鎴愬姛 1澶辫触 */ + /** + * 鐧诲綍鐘舵 0鎴愬姛 1澶辫触 + */ @Excel(name = "鐧诲綍鐘舵", readConverterExp = "0=鎴愬姛,1=澶辫触") private String status; - /** 鐧诲綍IP鍦板潃 */ + /** + * 鐧诲綍IP鍦板潃 + */ @Excel(name = "鐧诲綍鍦板潃") private String ipaddr; - /** 鐧诲綍鍦扮偣 */ + /** + * 鐧诲綍鍦扮偣 + */ @Excel(name = "鐧诲綍鍦扮偣") private String loginLocation; - /** 娴忚鍣ㄧ被鍨 */ + /** + * 娴忚鍣ㄧ被鍨 + */ @Excel(name = "娴忚鍣") private String browser; - /** 鎿嶄綔绯荤粺 */ + /** + * 鎿嶄綔绯荤粺 + */ @Excel(name = "鎿嶄綔绯荤粺") private String os; - /** 鎻愮ず娑堟伅 */ + /** + * 鎻愮ず娑堟伅 + */ @Excel(name = "鎻愮ず娑堟伅") private String msg; - /** 璁块棶鏃堕棿 */ + /** + * 璁块棶鏃堕棿 + */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "璁块棶鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date loginTime; - public Long getInfoId() - { + public Long getInfoId() { return infoId; } - public void setInfoId(Long infoId) - { + public void setInfoId(Long infoId) { this.infoId = infoId; } - public String getUserName() - { + public String getUserName() { return userName; } - public void setUserName(String userName) - { + public void setUserName(String userName) { this.userName = userName; } - public String getStatus() - { + public String getStatus() { return status; } - public void setStatus(String status) - { + public void setStatus(String status) { this.status = status; } - public String getIpaddr() - { + public String getIpaddr() { return ipaddr; } - public void setIpaddr(String ipaddr) - { + public void setIpaddr(String ipaddr) { this.ipaddr = ipaddr; } - public String getLoginLocation() - { + public String getLoginLocation() { return loginLocation; } - public void setLoginLocation(String loginLocation) - { + public void setLoginLocation(String loginLocation) { this.loginLocation = loginLocation; } - public String getBrowser() - { + public String getBrowser() { return browser; } - public void setBrowser(String browser) - { + public void setBrowser(String browser) { this.browser = browser; } - public String getOs() - { + public String getOs() { return os; } - public void setOs(String os) - { + public void setOs(String os) { this.os = os; } - public String getMsg() - { + public String getMsg() { return msg; } - public void setMsg(String msg) - { + public void setMsg(String msg) { this.msg = msg; } - public Date getLoginTime() - { + public Date getLoginTime() { return loginTime; } - public void setLoginTime(Date loginTime) - { + public void setLoginTime(Date loginTime) { this.loginTime = loginTime; } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java index afff8c9..11f5071 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java @@ -1,16 +1,16 @@ package com.ruoyi.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; + import java.util.List; /** * 璺敱閰嶇疆淇℃伅 - * + * * @author ruoyi */ @JsonInclude(JsonInclude.Include.NON_EMPTY) -public class RouterVo -{ +public class RouterVo { /** * 璺敱鍚嶅瓧 */ @@ -56,93 +56,75 @@ public class RouterVo */ private List children; - public String getName() - { + public String getName() { return name; } - public void setName(String name) - { + public void setName(String name) { this.name = name; } - public String getPath() - { + public String getPath() { return path; } - public void setPath(String path) - { + public void setPath(String path) { this.path = path; } - public boolean getHidden() - { + public boolean getHidden() { return hidden; } - public void setHidden(boolean hidden) - { + public void setHidden(boolean hidden) { this.hidden = hidden; } - public String getRedirect() - { + public String getRedirect() { return redirect; } - public void setRedirect(String redirect) - { + public void setRedirect(String redirect) { this.redirect = redirect; } - public String getComponent() - { + public String getComponent() { return component; } - public void setComponent(String component) - { + public void setComponent(String component) { this.component = component; } - public String getQuery() - { + public String getQuery() { return query; } - public void setQuery(String query) - { + public void setQuery(String query) { this.query = query; } - public Boolean getAlwaysShow() - { + public Boolean getAlwaysShow() { return alwaysShow; } - public void setAlwaysShow(Boolean alwaysShow) - { + public void setAlwaysShow(Boolean alwaysShow) { this.alwaysShow = alwaysShow; } - public MetaVo getMeta() - { + public MetaVo getMeta() { return meta; } - public void setMeta(MetaVo meta) - { + public void setMeta(MetaVo meta) { this.meta = meta; } - public List getChildren() - { + public List getChildren() { return children; } - public void setChildren(List children) - { + public void setChildren(List children) { this.children = children; } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java index 13d49d6..091b20f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java @@ -1,18 +1,18 @@ package com.ruoyi.system.mapper; -import java.util.List; import com.ruoyi.system.domain.SysConfig; +import java.util.List; + /** * 鍙傛暟閰嶇疆 鏁版嵁灞 - * + * * @author ruoyi */ -public interface SysConfigMapper -{ +public interface SysConfigMapper { /** * 鏌ヨ鍙傛暟閰嶇疆淇℃伅 - * + * * @param config 鍙傛暟閰嶇疆淇℃伅 * @return 鍙傛暟閰嶇疆淇℃伅 */ @@ -20,7 +20,7 @@ public interface SysConfigMapper /** * 閫氳繃ID鏌ヨ閰嶇疆 - * + * * @param configId 鍙傛暟ID * @return 鍙傛暟閰嶇疆淇℃伅 */ @@ -28,7 +28,7 @@ public interface SysConfigMapper /** * 鏌ヨ鍙傛暟閰嶇疆鍒楄〃 - * + * * @param config 鍙傛暟閰嶇疆淇℃伅 * @return 鍙傛暟閰嶇疆闆嗗悎 */ @@ -36,7 +36,7 @@ public interface SysConfigMapper /** * 鏍规嵁閿悕鏌ヨ鍙傛暟閰嶇疆淇℃伅 - * + * * @param configKey 鍙傛暟閿悕 * @return 鍙傛暟閰嶇疆淇℃伅 */ @@ -44,7 +44,7 @@ public interface SysConfigMapper /** * 鏂板鍙傛暟閰嶇疆 - * + * * @param config 鍙傛暟閰嶇疆淇℃伅 * @return 缁撴灉 */ @@ -52,7 +52,7 @@ public interface SysConfigMapper /** * 淇敼鍙傛暟閰嶇疆 - * + * * @param config 鍙傛暟閰嶇疆淇℃伅 * @return 缁撴灉 */ @@ -60,7 +60,7 @@ public interface SysConfigMapper /** * 鍒犻櫎鍙傛暟閰嶇疆 - * + * * @param configId 鍙傛暟ID * @return 缁撴灉 */ @@ -68,7 +68,7 @@ public interface SysConfigMapper /** * 鎵归噺鍒犻櫎鍙傛暟淇℃伅 - * + * * @param configIds 闇瑕佸垹闄ょ殑鍙傛暟ID * @return 缁撴灉 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java index 7d60696..be117a6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java @@ -1,21 +1,21 @@ package com.ruoyi.system.service; -import java.util.List; -import java.util.Set; import com.ruoyi.common.core.domain.TreeSelect; import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.system.domain.vo.RouterVo; +import java.util.List; +import java.util.Set; + /** * 鑿滃崟 涓氬姟灞 - * + * * @author ruoyi */ -public interface ISysMenuService -{ +public interface ISysMenuService { /** * 鏍规嵁鐢ㄦ埛鏌ヨ绯荤粺鑿滃崟鍒楄〃 - * + * * @param userId 鐢ㄦ埛ID * @return 鑿滃崟鍒楄〃 */ @@ -23,8 +23,8 @@ public interface ISysMenuService /** * 鏍规嵁鐢ㄦ埛鏌ヨ绯荤粺鑿滃崟鍒楄〃 - * - * @param menu 鑿滃崟淇℃伅 + * + * @param menu 鑿滃崟淇℃伅 * @param userId 鐢ㄦ埛ID * @return 鑿滃崟鍒楄〃 */ @@ -32,7 +32,7 @@ public interface ISysMenuService /** * 鏍规嵁鐢ㄦ埛ID鏌ヨ鏉冮檺 - * + * * @param userId 鐢ㄦ埛ID * @return 鏉冮檺鍒楄〃 */ @@ -40,7 +40,7 @@ public interface ISysMenuService /** * 鏍规嵁瑙掕壊ID鏌ヨ鏉冮檺 - * + * * @param roleId 瑙掕壊ID * @return 鏉冮檺鍒楄〃 */ @@ -48,7 +48,7 @@ public interface ISysMenuService /** * 鏍规嵁鐢ㄦ埛ID鏌ヨ鑿滃崟鏍戜俊鎭 - * + * * @param userId 鐢ㄦ埛ID * @return 鑿滃崟鍒楄〃 */ @@ -56,7 +56,7 @@ public interface ISysMenuService /** * 鏍规嵁瑙掕壊ID鏌ヨ鑿滃崟鏍戜俊鎭 - * + * * @param roleId 瑙掕壊ID * @return 閫変腑鑿滃崟鍒楄〃 */ @@ -64,7 +64,7 @@ public interface ISysMenuService /** * 鏋勫缓鍓嶇璺敱鎵闇瑕佺殑鑿滃崟 - * + * * @param menus 鑿滃崟鍒楄〃 * @return 璺敱鍒楄〃 */ @@ -72,7 +72,7 @@ public interface ISysMenuService /** * 鏋勫缓鍓嶇鎵闇瑕佹爲缁撴瀯 - * + * * @param menus 鑿滃崟鍒楄〃 * @return 鏍戠粨鏋勫垪琛 */ @@ -80,7 +80,7 @@ public interface ISysMenuService /** * 鏋勫缓鍓嶇鎵闇瑕佷笅鎷夋爲缁撴瀯 - * + * * @param menus 鑿滃崟鍒楄〃 * @return 涓嬫媺鏍戠粨鏋勫垪琛 */ @@ -88,7 +88,7 @@ public interface ISysMenuService /** * 鏍规嵁鑿滃崟ID鏌ヨ淇℃伅 - * + * * @param menuId 鑿滃崟ID * @return 鑿滃崟淇℃伅 */ @@ -96,7 +96,7 @@ public interface ISysMenuService /** * 鏄惁瀛樺湪鑿滃崟瀛愯妭鐐 - * + * * @param menuId 鑿滃崟ID * @return 缁撴灉 true 瀛樺湪 false 涓嶅瓨鍦 */ @@ -104,7 +104,7 @@ public interface ISysMenuService /** * 鏌ヨ鑿滃崟鏄惁瀛樺湪瑙掕壊 - * + * * @param menuId 鑿滃崟ID * @return 缁撴灉 true 瀛樺湪 false 涓嶅瓨鍦 */ @@ -112,7 +112,7 @@ public interface ISysMenuService /** * 鏂板淇濆瓨鑿滃崟淇℃伅 - * + * * @param menu 鑿滃崟淇℃伅 * @return 缁撴灉 */ @@ -120,7 +120,7 @@ public interface ISysMenuService /** * 淇敼淇濆瓨鑿滃崟淇℃伅 - * + * * @param menu 鑿滃崟淇℃伅 * @return 缁撴灉 */ @@ -128,7 +128,7 @@ public interface ISysMenuService /** * 鍒犻櫎鑿滃崟绠$悊淇℃伅 - * + * * @param menuId 鑿滃崟ID * @return 缁撴灉 */ @@ -136,7 +136,7 @@ public interface ISysMenuService /** * 鏍¢獙鑿滃崟鍚嶇О鏄惁鍞竴 - * + * * @param menu 鑿滃崟淇℃伅 * @return 缁撴灉 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java index 4d29b22..a7bb482 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java @@ -1,10 +1,5 @@ package com.ruoyi.system.service.impl; -import java.util.Collection; -import java.util.List; -import javax.annotation.PostConstruct; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.constant.CacheConstants; import com.ruoyi.common.constant.UserConstants; @@ -16,15 +11,20 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.mapper.SysConfigMapper; import com.ruoyi.system.service.ISysConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.PostConstruct; +import java.util.Collection; +import java.util.List; /** * 鍙傛暟閰嶇疆 鏈嶅姟灞傚疄鐜 - * + * * @author ruoyi */ @Service -public class SysConfigServiceImpl implements ISysConfigService -{ +public class SysConfigServiceImpl implements ISysConfigService { @Autowired private SysConfigMapper configMapper; @@ -35,21 +35,19 @@ public class SysConfigServiceImpl implements ISysConfigService * 椤圭洰鍚姩鏃讹紝鍒濆鍖栧弬鏁板埌缂撳瓨 */ @PostConstruct - public void init() - { + public void init() { loadingConfigCache(); } /** * 鏌ヨ鍙傛暟閰嶇疆淇℃伅 - * + * * @param configId 鍙傛暟閰嶇疆ID * @return 鍙傛暟閰嶇疆淇℃伅 */ @Override @DataSource(DataSourceType.MASTER) - public SysConfig selectConfigById(Long configId) - { + public SysConfig selectConfigById(Long configId) { SysConfig config = new SysConfig(); config.setConfigId(configId); return configMapper.selectConfig(config); @@ -57,23 +55,20 @@ public class SysConfigServiceImpl implements ISysConfigService /** * 鏍规嵁閿悕鏌ヨ鍙傛暟閰嶇疆淇℃伅 - * + * * @param configKey 鍙傛暟key * @return 鍙傛暟閿 */ @Override - public String selectConfigByKey(String configKey) - { + public String selectConfigByKey(String configKey) { String configValue = Convert.toStr(redisCache.getCacheObject(getCacheKey(configKey))); - if (StringUtils.isNotEmpty(configValue)) - { + if (StringUtils.isNotEmpty(configValue)) { return configValue; } SysConfig config = new SysConfig(); config.setConfigKey(configKey); SysConfig retConfig = configMapper.selectConfig(config); - if (StringUtils.isNotNull(retConfig)) - { + if (StringUtils.isNotNull(retConfig)) { redisCache.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue()); return retConfig.getConfigValue(); } @@ -82,15 +77,13 @@ public class SysConfigServiceImpl implements ISysConfigService /** * 鑾峰彇楠岃瘉鐮佸紑鍏 - * + * * @return true寮鍚紝false鍏抽棴 */ @Override - public boolean selectCaptchaEnabled() - { + public boolean selectCaptchaEnabled() { String captchaEnabled = selectConfigByKey("sys.account.captchaEnabled"); - if (StringUtils.isEmpty(captchaEnabled)) - { + if (StringUtils.isEmpty(captchaEnabled)) { return true; } return Convert.toBool(captchaEnabled); @@ -98,28 +91,25 @@ public class SysConfigServiceImpl implements ISysConfigService /** * 鏌ヨ鍙傛暟閰嶇疆鍒楄〃 - * + * * @param config 鍙傛暟閰嶇疆淇℃伅 * @return 鍙傛暟閰嶇疆闆嗗悎 */ @Override - public List selectConfigList(SysConfig config) - { + public List selectConfigList(SysConfig config) { return configMapper.selectConfigList(config); } /** * 鏂板鍙傛暟閰嶇疆 - * + * * @param config 鍙傛暟閰嶇疆淇℃伅 * @return 缁撴灉 */ @Override - public int insertConfig(SysConfig config) - { + public int insertConfig(SysConfig config) { int row = configMapper.insertConfig(config); - if (row > 0) - { + if (row > 0) { redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); } return row; @@ -127,22 +117,19 @@ public class SysConfigServiceImpl implements ISysConfigService /** * 淇敼鍙傛暟閰嶇疆 - * + * * @param config 鍙傛暟閰嶇疆淇℃伅 * @return 缁撴灉 */ @Override - public int updateConfig(SysConfig config) - { + public int updateConfig(SysConfig config) { SysConfig temp = configMapper.selectConfigById(config.getConfigId()); - if (!StringUtils.equals(temp.getConfigKey(), config.getConfigKey())) - { + if (!StringUtils.equals(temp.getConfigKey(), config.getConfigKey())) { redisCache.deleteObject(getCacheKey(temp.getConfigKey())); } int row = configMapper.updateConfig(config); - if (row > 0) - { + if (row > 0) { redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); } return row; @@ -150,17 +137,14 @@ public class SysConfigServiceImpl implements ISysConfigService /** * 鎵归噺鍒犻櫎鍙傛暟淇℃伅 - * + * * @param configIds 闇瑕佸垹闄ょ殑鍙傛暟ID */ @Override - public void deleteConfigByIds(Long[] configIds) - { - for (Long configId : configIds) - { + public void deleteConfigByIds(Long[] configIds) { + for (Long configId : configIds) { SysConfig config = selectConfigById(configId); - if (StringUtils.equals(UserConstants.YES, config.getConfigType())) - { + if (StringUtils.equals(UserConstants.YES, config.getConfigType())) { throw new ServiceException(String.format("鍐呯疆鍙傛暟銆%1$s銆戜笉鑳藉垹闄 ", config.getConfigKey())); } configMapper.deleteConfigById(configId); @@ -172,11 +156,9 @@ public class SysConfigServiceImpl implements ISysConfigService * 鍔犺浇鍙傛暟缂撳瓨鏁版嵁 */ @Override - public void loadingConfigCache() - { + public void loadingConfigCache() { List configsList = configMapper.selectConfigList(new SysConfig()); - for (SysConfig config : configsList) - { + for (SysConfig config : configsList) { redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); } } @@ -185,8 +167,7 @@ public class SysConfigServiceImpl implements ISysConfigService * 娓呯┖鍙傛暟缂撳瓨鏁版嵁 */ @Override - public void clearConfigCache() - { + public void clearConfigCache() { Collection keys = redisCache.keys(CacheConstants.SYS_CONFIG_KEY + "*"); redisCache.deleteObject(keys); } @@ -195,25 +176,22 @@ public class SysConfigServiceImpl implements ISysConfigService * 閲嶇疆鍙傛暟缂撳瓨鏁版嵁 */ @Override - public void resetConfigCache() - { + public void resetConfigCache() { clearConfigCache(); loadingConfigCache(); } /** * 鏍¢獙鍙傛暟閿悕鏄惁鍞竴 - * + * * @param config 鍙傛暟閰嶇疆淇℃伅 * @return 缁撴灉 */ @Override - public boolean checkConfigKeyUnique(SysConfig config) - { + public boolean checkConfigKeyUnique(SysConfig config) { Long configId = StringUtils.isNull(config.getConfigId()) ? -1L : config.getConfigId(); SysConfig info = configMapper.checkConfigKeyUnique(config.getConfigKey()); - if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue()) - { + if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue()) { return UserConstants.NOT_UNIQUE; } return UserConstants.UNIQUE; @@ -221,12 +199,11 @@ public class SysConfigServiceImpl implements ISysConfigService /** * 璁剧疆cache key - * + * * @param configKey 鍙傛暟閿 * @return 缂撳瓨閿甼ey */ - private String getCacheKey(String configKey) - { + private String getCacheKey(String configKey) { return CacheConstants.SYS_CONFIG_KEY + configKey; } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java index 25dd14b..ca8648f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java @@ -1,15 +1,5 @@ package com.ruoyi.system.service.impl; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.TreeSelect; @@ -24,15 +14,25 @@ import com.ruoyi.system.mapper.SysMenuMapper; import com.ruoyi.system.mapper.SysRoleMapper; import com.ruoyi.system.mapper.SysRoleMenuMapper; import com.ruoyi.system.service.ISysMenuService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; /** * 鑿滃崟 涓氬姟灞傚鐞 - * + * * @author ruoyi */ @Service -public class SysMenuServiceImpl implements ISysMenuService -{ +public class SysMenuServiceImpl implements ISysMenuService { public static final String PREMISSION_STRING = "perms[\"{0}\"]"; @Autowired @@ -46,33 +46,28 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 鏍规嵁鐢ㄦ埛鏌ヨ绯荤粺鑿滃崟鍒楄〃 - * + * * @param userId 鐢ㄦ埛ID * @return 鑿滃崟鍒楄〃 */ @Override - public List selectMenuList(Long userId) - { + public List selectMenuList(Long userId) { return selectMenuList(new SysMenu(), userId); } /** * 鏌ヨ绯荤粺鑿滃崟鍒楄〃 - * + * * @param menu 鑿滃崟淇℃伅 * @return 鑿滃崟鍒楄〃 */ @Override - public List selectMenuList(SysMenu menu, Long userId) - { + public List selectMenuList(SysMenu menu, Long userId) { List menuList = null; // 绠$悊鍛樻樉绀烘墍鏈夎彍鍗曚俊鎭 - if (SysUser.isAdmin(userId)) - { + if (SysUser.isAdmin(userId)) { menuList = menuMapper.selectMenuList(menu); - } - else - { + } else { menu.getParams().put("userId", userId); menuList = menuMapper.selectMenuListByUserId(menu); } @@ -81,19 +76,16 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 鏍规嵁鐢ㄦ埛ID鏌ヨ鏉冮檺 - * + * * @param userId 鐢ㄦ埛ID * @return 鏉冮檺鍒楄〃 */ @Override - public Set selectMenuPermsByUserId(Long userId) - { + public Set selectMenuPermsByUserId(Long userId) { List perms = menuMapper.selectMenuPermsByUserId(userId); Set permsSet = new HashSet<>(); - for (String perm : perms) - { - if (StringUtils.isNotEmpty(perm)) - { + for (String perm : perms) { + if (StringUtils.isNotEmpty(perm)) { permsSet.addAll(Arrays.asList(perm.trim().split(","))); } } @@ -102,19 +94,16 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 鏍规嵁瑙掕壊ID鏌ヨ鏉冮檺 - * + * * @param roleId 瑙掕壊ID * @return 鏉冮檺鍒楄〃 */ @Override - public Set selectMenuPermsByRoleId(Long roleId) - { + public Set selectMenuPermsByRoleId(Long roleId) { List perms = menuMapper.selectMenuPermsByRoleId(roleId); Set permsSet = new HashSet<>(); - for (String perm : perms) - { - if (StringUtils.isNotEmpty(perm)) - { + for (String perm : perms) { + if (StringUtils.isNotEmpty(perm)) { permsSet.addAll(Arrays.asList(perm.trim().split(","))); } } @@ -123,20 +112,16 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 鏍规嵁鐢ㄦ埛ID鏌ヨ鑿滃崟 - * + * * @param userId 鐢ㄦ埛鍚嶇О * @return 鑿滃崟鍒楄〃 */ @Override - public List selectMenuTreeByUserId(Long userId) - { + public List selectMenuTreeByUserId(Long userId) { List menus = null; - if (SecurityUtils.isAdmin(userId)) - { + if (SecurityUtils.isAdmin(userId)) { menus = menuMapper.selectMenuTreeAll(); - } - else - { + } else { menus = menuMapper.selectMenuTreeByUserId(userId); } return getChildPerms(menus, 0); @@ -144,29 +129,26 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 鏍规嵁瑙掕壊ID鏌ヨ鑿滃崟鏍戜俊鎭 - * + * * @param roleId 瑙掕壊ID * @return 閫変腑鑿滃崟鍒楄〃 */ @Override - public List selectMenuListByRoleId(Long roleId) - { + public List selectMenuListByRoleId(Long roleId) { SysRole role = roleMapper.selectRoleById(roleId); return menuMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly()); } /** * 鏋勫缓鍓嶇璺敱鎵闇瑕佺殑鑿滃崟 - * + * * @param menus 鑿滃崟鍒楄〃 * @return 璺敱鍒楄〃 */ @Override - public List buildMenus(List menus) - { + public List buildMenus(List menus) { List routers = new LinkedList(); - for (SysMenu menu : menus) - { + for (SysMenu menu : menus) { RouterVo router = new RouterVo(); router.setHidden("1".equals(menu.getVisible())); router.setName(getRouteName(menu)); @@ -175,14 +157,11 @@ public class SysMenuServiceImpl implements ISysMenuService router.setQuery(menu.getQuery()); router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath())); List cMenus = menu.getChildren(); - if (StringUtils.isNotEmpty(cMenus) && UserConstants.TYPE_DIR.equals(menu.getMenuType())) - { + if (StringUtils.isNotEmpty(cMenus) && UserConstants.TYPE_DIR.equals(menu.getMenuType())) { router.setAlwaysShow(true); router.setRedirect("noRedirect"); router.setChildren(buildMenus(cMenus)); - } - else if (isMenuFrame(menu)) - { + } else if (isMenuFrame(menu)) { router.setMeta(null); List childrenList = new ArrayList(); RouterVo children = new RouterVo(); @@ -193,9 +172,7 @@ public class SysMenuServiceImpl implements ISysMenuService children.setQuery(menu.getQuery()); childrenList.add(children); router.setChildren(childrenList); - } - else if (menu.getParentId().intValue() == 0 && isInnerLink(menu)) - { + } else if (menu.getParentId().intValue() == 0 && isInnerLink(menu)) { router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon())); router.setPath("/"); List childrenList = new ArrayList(); @@ -215,27 +192,23 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 鏋勫缓鍓嶇鎵闇瑕佹爲缁撴瀯 - * + * * @param menus 鑿滃崟鍒楄〃 * @return 鏍戠粨鏋勫垪琛 */ @Override - public List buildMenuTree(List menus) - { + public List buildMenuTree(List menus) { List returnList = new ArrayList(); List tempList = menus.stream().map(SysMenu::getMenuId).collect(Collectors.toList()); - for (Iterator iterator = menus.iterator(); iterator.hasNext();) - { + for (Iterator iterator = menus.iterator(); iterator.hasNext(); ) { SysMenu menu = (SysMenu) iterator.next(); // 濡傛灉鏄《绾ц妭鐐, 閬嶅巻璇ョ埗鑺傜偣鐨勬墍鏈夊瓙鑺傜偣 - if (!tempList.contains(menu.getParentId())) - { + if (!tempList.contains(menu.getParentId())) { recursionFn(menus, menu); returnList.add(menu); } } - if (returnList.isEmpty()) - { + if (returnList.isEmpty()) { returnList = menus; } return returnList; @@ -243,104 +216,95 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 鏋勫缓鍓嶇鎵闇瑕佷笅鎷夋爲缁撴瀯 - * + * * @param menus 鑿滃崟鍒楄〃 * @return 涓嬫媺鏍戠粨鏋勫垪琛 */ @Override - public List buildMenuTreeSelect(List menus) - { + public List buildMenuTreeSelect(List menus) { List menuTrees = buildMenuTree(menus); return menuTrees.stream().map(TreeSelect::new).collect(Collectors.toList()); } /** * 鏍规嵁鑿滃崟ID鏌ヨ淇℃伅 - * + * * @param menuId 鑿滃崟ID * @return 鑿滃崟淇℃伅 */ @Override - public SysMenu selectMenuById(Long menuId) - { + public SysMenu selectMenuById(Long menuId) { return menuMapper.selectMenuById(menuId); } /** * 鏄惁瀛樺湪鑿滃崟瀛愯妭鐐 - * + * * @param menuId 鑿滃崟ID * @return 缁撴灉 */ @Override - public boolean hasChildByMenuId(Long menuId) - { + public boolean hasChildByMenuId(Long menuId) { int result = menuMapper.hasChildByMenuId(menuId); return result > 0; } /** * 鏌ヨ鑿滃崟浣跨敤鏁伴噺 - * + * * @param menuId 鑿滃崟ID * @return 缁撴灉 */ @Override - public boolean checkMenuExistRole(Long menuId) - { + public boolean checkMenuExistRole(Long menuId) { int result = roleMenuMapper.checkMenuExistRole(menuId); return result > 0; } /** * 鏂板淇濆瓨鑿滃崟淇℃伅 - * + * * @param menu 鑿滃崟淇℃伅 * @return 缁撴灉 */ @Override - public int insertMenu(SysMenu menu) - { + public int insertMenu(SysMenu menu) { return menuMapper.insertMenu(menu); } /** * 淇敼淇濆瓨鑿滃崟淇℃伅 - * + * * @param menu 鑿滃崟淇℃伅 * @return 缁撴灉 */ @Override - public int updateMenu(SysMenu menu) - { + public int updateMenu(SysMenu menu) { return menuMapper.updateMenu(menu); } /** * 鍒犻櫎鑿滃崟绠$悊淇℃伅 - * + * * @param menuId 鑿滃崟ID * @return 缁撴灉 */ @Override - public int deleteMenuById(Long menuId) - { + public int deleteMenuById(Long menuId) { return menuMapper.deleteMenuById(menuId); } /** * 鏍¢獙鑿滃崟鍚嶇О鏄惁鍞竴 - * + * * @param menu 鑿滃崟淇℃伅 * @return 缁撴灉 */ @Override - public boolean checkMenuNameUnique(SysMenu menu) - { + public boolean checkMenuNameUnique(SysMenu menu) { Long menuId = StringUtils.isNull(menu.getMenuId()) ? -1L : menu.getMenuId(); SysMenu info = menuMapper.checkMenuNameUnique(menu.getMenuName(), menu.getParentId()); - if (StringUtils.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue()) - { + if (StringUtils.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue()) { return UserConstants.NOT_UNIQUE; } return UserConstants.UNIQUE; @@ -348,16 +312,14 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 鑾峰彇璺敱鍚嶇О - * + * * @param menu 鑿滃崟淇℃伅 * @return 璺敱鍚嶇О */ - public String getRouteName(SysMenu menu) - { + public String getRouteName(SysMenu menu) { String routerName = StringUtils.capitalize(menu.getPath()); // 闈炲閾惧苟涓旀槸涓绾х洰褰曪紙绫诲瀷涓虹洰褰曪級 - if (isMenuFrame(menu)) - { + if (isMenuFrame(menu)) { routerName = StringUtils.EMPTY; } return routerName; @@ -365,27 +327,22 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 鑾峰彇璺敱鍦板潃 - * + * * @param menu 鑿滃崟淇℃伅 * @return 璺敱鍦板潃 */ - public String getRouterPath(SysMenu menu) - { + public String getRouterPath(SysMenu menu) { String routerPath = menu.getPath(); // 鍐呴摼鎵撳紑澶栫綉鏂瑰紡 - if (menu.getParentId().intValue() != 0 && isInnerLink(menu)) - { + if (menu.getParentId().intValue() != 0 && isInnerLink(menu)) { routerPath = innerLinkReplaceEach(routerPath); } // 闈炲閾惧苟涓旀槸涓绾х洰褰曪紙绫诲瀷涓虹洰褰曪級 - if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType()) - && UserConstants.NO_FRAME.equals(menu.getIsFrame())) - { + if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType()) && UserConstants.NO_FRAME.equals(menu.getIsFrame())) { routerPath = "/" + menu.getPath(); } // 闈炲閾惧苟涓旀槸涓绾х洰褰曪紙绫诲瀷涓鸿彍鍗曪級 - else if (isMenuFrame(menu)) - { + else if (isMenuFrame(menu)) { routerPath = "/"; } return routerPath; @@ -393,23 +350,17 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 鑾峰彇缁勪欢淇℃伅 - * + * * @param menu 鑿滃崟淇℃伅 * @return 缁勪欢淇℃伅 */ - public String getComponent(SysMenu menu) - { + public String getComponent(SysMenu menu) { String component = UserConstants.LAYOUT; - if (StringUtils.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu)) - { + if (StringUtils.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu)) { component = menu.getComponent(); - } - else if (StringUtils.isEmpty(menu.getComponent()) && menu.getParentId().intValue() != 0 && isInnerLink(menu)) - { + } else if (StringUtils.isEmpty(menu.getComponent()) && menu.getParentId().intValue() != 0 && isInnerLink(menu)) { component = UserConstants.INNER_LINK; - } - else if (StringUtils.isEmpty(menu.getComponent()) && isParentView(menu)) - { + } else if (StringUtils.isEmpty(menu.getComponent()) && isParentView(menu)) { component = UserConstants.PARENT_VIEW; } return component; @@ -417,54 +368,47 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 鏄惁涓鸿彍鍗曞唴閮ㄨ烦杞 - * + * * @param menu 鑿滃崟淇℃伅 * @return 缁撴灉 */ - public boolean isMenuFrame(SysMenu menu) - { - return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType()) - && menu.getIsFrame().equals(UserConstants.NO_FRAME); + public boolean isMenuFrame(SysMenu menu) { + return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType()) && menu.getIsFrame().equals(UserConstants.NO_FRAME); } /** * 鏄惁涓哄唴閾剧粍浠 - * + * * @param menu 鑿滃崟淇℃伅 * @return 缁撴灉 */ - public boolean isInnerLink(SysMenu menu) - { + public boolean isInnerLink(SysMenu menu) { return menu.getIsFrame().equals(UserConstants.NO_FRAME) && StringUtils.ishttp(menu.getPath()); } /** * 鏄惁涓簆arent_view缁勪欢 - * + * * @param menu 鑿滃崟淇℃伅 * @return 缁撴灉 */ - public boolean isParentView(SysMenu menu) - { + public boolean isParentView(SysMenu menu) { return menu.getParentId().intValue() != 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType()); } /** * 鏍规嵁鐖惰妭鐐圭殑ID鑾峰彇鎵鏈夊瓙鑺傜偣 - * - * @param list 鍒嗙被琛 + * + * @param list 鍒嗙被琛 * @param parentId 浼犲叆鐨勭埗鑺傜偣ID * @return String */ - public List getChildPerms(List list, int parentId) - { + public List getChildPerms(List list, int parentId) { List returnList = new ArrayList(); - for (Iterator iterator = list.iterator(); iterator.hasNext();) - { + for (Iterator iterator = list.iterator(); iterator.hasNext(); ) { SysMenu t = (SysMenu) iterator.next(); // 涓銆佹牴鎹紶鍏ョ殑鏌愪釜鐖惰妭鐐笽D,閬嶅巻璇ョ埗鑺傜偣鐨勬墍鏈夊瓙鑺傜偣 - if (t.getParentId() == parentId) - { + if (t.getParentId() == parentId) { recursionFn(list, t); returnList.add(t); } @@ -474,19 +418,16 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 閫掑綊鍒楄〃 - * + * * @param list 鍒嗙被琛 - * @param t 瀛愯妭鐐 + * @param t 瀛愯妭鐐 */ - private void recursionFn(List list, SysMenu t) - { + private void recursionFn(List list, SysMenu t) { // 寰楀埌瀛愯妭鐐瑰垪琛 List childList = getChildList(list, t); t.setChildren(childList); - for (SysMenu tChild : childList) - { - if (hasChild(list, tChild)) - { + for (SysMenu tChild : childList) { + if (hasChild(list, tChild)) { recursionFn(list, tChild); } } @@ -495,15 +436,12 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 寰楀埌瀛愯妭鐐瑰垪琛 */ - private List getChildList(List list, SysMenu t) - { + private List getChildList(List list, SysMenu t) { List tlist = new ArrayList(); Iterator it = list.iterator(); - while (it.hasNext()) - { + while (it.hasNext()) { SysMenu n = (SysMenu) it.next(); - if (n.getParentId().longValue() == t.getMenuId().longValue()) - { + if (n.getParentId().longValue() == t.getMenuId().longValue()) { tlist.add(n); } } @@ -513,19 +451,16 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 鍒ゆ柇鏄惁鏈夊瓙鑺傜偣 */ - private boolean hasChild(List list, SysMenu t) - { + private boolean hasChild(List list, SysMenu t) { return getChildList(list, t).size() > 0; } /** * 鍐呴摼鍩熷悕鐗规畩瀛楃鏇挎崲 - * + * * @return 鏇挎崲鍚庣殑鍐呴摼鍩熷悕 */ - public String innerLinkReplaceEach(String path) - { - return StringUtils.replaceEach(path, new String[] { Constants.HTTP, Constants.HTTPS, Constants.WWW, ".", ":" }, - new String[] { "", "", "", "/", "/" }); + public String innerLinkReplaceEach(String path) { + return StringUtils.replaceEach(path, new String[]{Constants.HTTP, Constants.HTTPS, Constants.WWW, ".", ":"}, new String[]{"", "", "", "/", "/"}); } } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml index ca39f47..a1a876a 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -1,96 +1,105 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - + + + + + + + + + + + - + - select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark - from sys_config + select config_id, + config_name, + config_key, + config_value, + config_type, + create_by, + create_time, + update_by, + update_time, + remark + from sys_config - + - - - - and config_id = #{configId} - - - and config_key = #{configKey} - - - - - - - - - AND config_name like concat('%', #{configName}, '%') - - - AND config_type = #{configType} - - - AND config_key like concat('%', #{configKey}, '%') - - - and date_format(create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') - - - and date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') - - + + AND config_name like concat('%', #{configName}, '%') + + + AND config_type = #{configType} + + + AND config_key like concat('%', #{configKey}, '%') + + + and date_format(create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') + + + and date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') + + - + - + - - + + insert into sys_config ( - config_name, - config_key, - config_value, - config_type, - create_by, - remark, - create_time + config_name, + config_key, + config_value, + config_type, + create_by, + remark, + create_time )values( - #{configName}, - #{configKey}, - #{configValue}, - #{configType}, - #{createBy}, - #{remark}, - sysdate() - ) + #{configName}, + #{configKey}, + #{configValue}, + #{configType}, + #{createBy}, + #{remark}, + sysdate() + ) - - - update sys_config + + + update sys_config config_name = #{configName}, config_key = #{configKey}, @@ -98,20 +107,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" config_type = #{configType}, update_by = #{updateBy}, remark = #{remark}, - update_time = sysdate() + update_time = sysdate() where config_id = #{configId} - + - delete from sys_config where config_id = #{configId} + delete + from sys_config + where config_id = #{configId} - + - delete from sys_config where config_id in + delete from sys_config where config_id in - #{configId} + #{configId} - + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml index cf439f6..87575be 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -1,159 +1,193 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time + + + + + + + + + + + + + + + + + + + + select d.dept_id, + d.parent_id, + d.ancestors, + d.dept_name, + d.order_num, + d.leader, + d.phone, + d.email, + d.status, + d.del_flag, + d.create_by, + d.create_time from sys_dept d - - where d.del_flag = '0' - - AND dept_id = #{deptId} - + + AND dept_id = #{deptId} + - AND parent_id = #{parentId} - - - AND dept_name like concat('%', #{deptName}, '%') - - - AND status = #{status} - - - ${params.dataScope} - order by d.parent_id, d.order_num + AND parent_id = #{parentId} + + + AND dept_name like concat('%', #{deptName}, '%') + + + AND status = #{status} + + + ${params.dataScope} + order by d.parent_id, d.order_num - + - + + and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = + rd.dept_id and rd.role_id = #{roleId}) + + order by d.parent_id, d.order_num + + - + select d.dept_id, + d.parent_id, + d.ancestors, + d.dept_name, + d.order_num, + d.leader, + d.phone, + d.email, + d.status, + (select dept_name from sys_dept where dept_id = d.parent_id) parent_name + from sys_dept d + where d.dept_id = #{deptId} + + - - - - - - - - - - - insert into sys_dept( - dept_id, - parent_id, - dept_name, - ancestors, - order_num, - leader, - phone, - email, - status, - create_by, - create_time - )values( - #{deptId}, - #{parentId}, - #{deptName}, - #{ancestors}, - #{orderNum}, - #{leader}, - #{phone}, - #{email}, - #{status}, - #{createBy}, - sysdate() - ) - - - - update sys_dept - - parent_id = #{parentId}, - dept_name = #{deptName}, - ancestors = #{ancestors}, - order_num = #{orderNum}, - leader = #{leader}, - phone = #{phone}, - email = #{email}, - status = #{status}, - update_by = #{updateBy}, - update_time = sysdate() - - where dept_id = #{deptId} - - - - update sys_dept set ancestors = - - when #{item.deptId} then #{item.ancestors} - - where dept_id in - - #{item.deptId} - - - - - update sys_dept set status = '0' where dept_id in - - #{deptId} + select count(1) + from sys_user + where dept_id = #{deptId} + and del_flag = '0' + + + + + + + + + + + + insert into sys_dept( + dept_id, + parent_id, + dept_name, + ancestors, + order_num, + leader, + phone, + email, + status, + create_by, + create_time + )values( + #{deptId}, + #{parentId}, + #{deptName}, + #{ancestors}, + #{orderNum}, + #{leader}, + #{phone}, + #{email}, + #{status}, + #{createBy}, + sysdate() + ) + + + + update sys_dept + + parent_id = #{parentId}, + dept_name = #{deptName}, + ancestors = #{ancestors}, + order_num = #{orderNum}, + leader = #{leader}, + phone = #{phone}, + email = #{email}, + status = #{status}, + update_by = #{updateBy}, + update_time = sysdate() + + where dept_id = #{deptId} + + + + update sys_dept set ancestors = + + when #{item.deptId} then #{item.ancestors} + + where dept_id in + + #{item.deptId} - - - - update sys_dept set del_flag = '2' where dept_id = #{deptId} - + + + + update sys_dept set status = '0' where dept_id in + + #{deptId} + + + + + update sys_dept + set del_flag = '2' + where dept_id = #{deptId} + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml index 8da9030..6c5689a 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -1,124 +1,145 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark - from sys_dict_data + + + + + + + + + + + + + + + + + + + select dict_code, + dict_sort, + dict_label, + dict_value, + dict_type, + css_class, + list_class, + is_default, + status, + create_by, + create_time, + remark + from sys_dict_data - - - - - - - - - - - - delete from sys_dict_data where dict_code = #{dictCode} - - - - delete from sys_dict_data where dict_code in - - #{dictCode} - - - - - update sys_dict_data - - dict_sort = #{dictSort}, - dict_label = #{dictLabel}, - dict_value = #{dictValue}, - dict_type = #{dictType}, - css_class = #{cssClass}, - list_class = #{listClass}, - is_default = #{isDefault}, - status = #{status}, - remark = #{remark}, - update_by = #{updateBy}, - update_time = sysdate() - - where dict_code = #{dictCode} - - - - update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType} - - - - insert into sys_dict_data( - dict_sort, - dict_label, - dict_value, - dict_type, - css_class, - list_class, - is_default, - status, - remark, - create_by, - create_time - )values( - #{dictSort}, - #{dictLabel}, - #{dictValue}, - #{dictType}, - #{cssClass}, - #{listClass}, - #{isDefault}, - #{status}, - #{remark}, - #{createBy}, - sysdate() - ) - - + + + + + + + + + + + + delete + from sys_dict_data + where dict_code = #{dictCode} + + + + delete from sys_dict_data where dict_code in + + #{dictCode} + + + + + update sys_dict_data + + dict_sort = #{dictSort}, + dict_label = #{dictLabel}, + dict_value = #{dictValue}, + dict_type = #{dictType}, + css_class = #{cssClass}, + list_class = #{listClass}, + is_default = #{isDefault}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where dict_code = #{dictCode} + + + + update sys_dict_data + set dict_type = #{newDictType} + where dict_type = #{oldDictType} + + + + insert into sys_dict_data( + dict_sort, + dict_label, + dict_value, + dict_type, + css_class, + list_class, + is_default, + status, + remark, + create_by, + create_time + )values( + #{dictSort}, + #{dictLabel}, + #{dictValue}, + #{dictType}, + #{cssClass}, + #{listClass}, + #{isDefault}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml index 55b4075..36daeed 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -1,105 +1,108 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - select dict_id, dict_name, dict_type, status, create_by, create_time, remark - from sys_dict_type + + + + + + + + + + + + + select dict_id, dict_name, dict_type, status, create_by, create_time, remark + from sys_dict_type - - - - - - - - - - - - delete from sys_dict_type where dict_id = #{dictId} - - - - delete from sys_dict_type where dict_id in - - #{dictId} - - + + + + + + + + + + + + delete + from sys_dict_type + where dict_id = #{dictId} + + + + delete from sys_dict_type where dict_id in + + #{dictId} + + + + + update sys_dict_type + + dict_name = #{dictName}, + dict_type = #{dictType}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where dict_id = #{dictId} + + + + insert into sys_dict_type( + dict_name, + dict_type, + status, + remark, + create_by, + create_time + )values( + #{dictName}, + #{dictType}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + - - update sys_dict_type - - dict_name = #{dictName}, - dict_type = #{dictType}, - status = #{status}, - remark = #{remark}, - update_by = #{updateBy}, - update_time = sysdate() - - where dict_id = #{dictId} - - - - insert into sys_dict_type( - dict_name, - dict_type, - status, - remark, - create_by, - create_time - )values( - #{dictName}, - #{dictType}, - #{status}, - #{remark}, - #{createBy}, - sysdate() - ) - - \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml index 822d665..6078a04 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -1,57 +1,58 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - + + + + + + + + + + + + + + insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time) + values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate()) + + + + + + delete from sys_logininfor where info_id in + + #{infoId} + + - - insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time) - values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate()) - - - - - - delete from sys_logininfor where info_id in - - #{infoId} - - - truncate table sys_logininfor - + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml index 6762007..8ced201 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -1,202 +1,260 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - - - - - select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time - from sys_menu + + + + + + + + + + + + + + + + + + + + + + + + + select menu_id, + menu_name, + parent_id, + order_num, + path, + component, + `query`, + is_frame, + is_cache, + menu_type, + visible, + status, + ifnull(perms, '') as perms, + icon, + create_time + from sys_menu - - - - - - + + + + AND menu_name like concat('%', #{menuName}, '%') + + + AND visible = #{visible} + + + AND status = #{status} + + + order by parent_id, order_num + + + + + - + + order by m.parent_id, m.order_num + + - - + + - - - - - - - - - - - - - - - update sys_menu - - menu_name = #{menuName}, - parent_id = #{parentId}, - order_num = #{orderNum}, - path = #{path}, - component = #{component}, - `query` = #{query}, - is_frame = #{isFrame}, - is_cache = #{isCache}, - menu_type = #{menuType}, - visible = #{visible}, - status = #{status}, - perms = #{perms}, - icon = #{icon}, - remark = #{remark}, - update_by = #{updateBy}, - update_time = sysdate() - - where menu_id = #{menuId} - - - - insert into sys_menu( - menu_id, - parent_id, - menu_name, - order_num, - path, - component, - `query`, - is_frame, - is_cache, - menu_type, - visible, - status, - perms, - icon, - remark, - create_by, - create_time - )values( - #{menuId}, - #{parentId}, - #{menuName}, - #{orderNum}, - #{path}, - #{component}, - #{query}, - #{isFrame}, - #{isCache}, - #{menuType}, - #{visible}, - #{status}, - #{perms}, - #{icon}, - #{remark}, - #{createBy}, - sysdate() - ) - - - - delete from sys_menu where menu_id = #{menuId} - + + and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.menu_id = + rm.menu_id and rm.role_id = #{roleId}) + + order by m.parent_id, m.order_num + + + + + + + + + + + + + + + + update sys_menu + + menu_name = #{menuName}, + parent_id = #{parentId}, + order_num = #{orderNum}, + path = #{path}, + component = #{component}, + `query` = #{query}, + is_frame = #{isFrame}, + is_cache = #{isCache}, + menu_type = #{menuType}, + visible = #{visible}, + status = #{status}, + perms = #{perms}, + icon = #{icon}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where menu_id = #{menuId} + + + + insert into sys_menu( + menu_id, + parent_id, + menu_name, + order_num, + path, + component, + `query`, + is_frame, + is_cache, + menu_type, + visible, + status, + perms, + icon, + remark, + create_by, + create_time + )values( + #{menuId}, + #{parentId}, + #{menuName}, + #{orderNum}, + #{path}, + #{component}, + #{query}, + #{isFrame}, + #{isCache}, + #{menuType}, + #{visible}, + #{status}, + #{perms}, + #{icon}, + #{remark}, + #{createBy}, + sysdate() + ) + + + + delete + from sys_menu + where menu_id = #{menuId} + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml index 65d3079..4d3158a 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -1,89 +1,100 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - + + + + + + + + + + + + - + - select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark - from sys_notice + select notice_id, + notice_title, + notice_type, + cast(notice_content as char) as notice_content, + status, + create_by, + create_time, + update_by, + update_time, + remark + from sys_notice - + - - - - AND notice_title like concat('%', #{noticeTitle}, '%') - - - AND notice_type = #{noticeType} - - - AND create_by like concat('%', #{createBy}, '%') - - + + AND notice_title like concat('%', #{noticeTitle}, '%') + + + AND notice_type = #{noticeType} + + + AND create_by like concat('%', #{createBy}, '%') + + - - + + insert into sys_notice ( - notice_title, - notice_type, - notice_content, - status, - remark, - create_by, - create_time - )values( - #{noticeTitle}, - #{noticeType}, - #{noticeContent}, - #{status}, - #{remark}, - #{createBy}, - sysdate() - ) + notice_title, + notice_type, + notice_content, + status, + remark, + create_by, + create_time + )values( + #{noticeTitle}, + #{noticeType}, + #{noticeContent}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) - - - update sys_notice + + + update sys_notice - notice_title = #{noticeTitle}, - notice_type = #{noticeType}, - notice_content = #{noticeContent}, - status = #{status}, + notice_title = #{noticeTitle}, + notice_type = #{noticeType}, + notice_content = #{noticeContent}, + status = #{status}, update_by = #{updateBy}, - update_time = sysdate() + update_time = sysdate() where notice_id = #{noticeId} - + - delete from sys_notice where notice_id = #{noticeId} + delete + from sys_notice + where notice_id = #{noticeId} - + - delete from sys_notice where notice_id in + delete from sys_notice where notice_id in #{noticeId} - + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml index 201db07..0241d65 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -1,86 +1,106 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time, cost_time + + select oper_id, + title, + business_type, + method, + request_method, + operator_type, + oper_name, + dept_name, + oper_url, + oper_ip, + oper_location, + oper_param, + json_result, + status, + error_msg, + oper_time, + cost_time from sys_oper_log - - - insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time, oper_time) - values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate()) - - - - - - delete from sys_oper_log where oper_id in - - #{operId} - - - - - - + + + insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, + oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, + cost_time, oper_time) + values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, + #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, + #{costTime}, sysdate()) + + + + + + delete from sys_oper_log where oper_id in + + #{operId} + + + + + + truncate table sys_oper_log diff --git a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml index 227c459..039b980 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -1,122 +1,132 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark - from sys_post + + + + + + + + + + + + + + + select post_id, + post_code, + post_name, + post_sort, + status, + create_by, + create_time, + remark + from sys_post - - - - - - - - + + + + AND post_code like concat('%', #{postCode}, '%') + + + AND status = #{status} + + + AND post_name like concat('%', #{postName}, '%') + + + + + + + + + + + - - - - - - - - - update sys_post - - post_code = #{postCode}, - post_name = #{postName}, - post_sort = #{postSort}, - status = #{status}, - remark = #{remark}, - update_by = #{updateBy}, - update_time = sysdate() - - where post_id = #{postId} - - - - insert into sys_post( - post_id, - post_code, - post_name, - post_sort, - status, - remark, - create_by, - create_time - )values( - #{postId}, - #{postCode}, - #{postName}, - #{postSort}, - #{status}, - #{remark}, - #{createBy}, - sysdate() - ) - - - - delete from sys_post where post_id = #{postId} - - - - delete from sys_post where post_id in - - #{postId} - - + left join sys_user_post up on up.post_id = p.post_id + left join sys_user u on u.user_id = up.user_id + where u.user_name = #{userName} + + + + + + + + update sys_post + + post_code = #{postCode}, + post_name = #{postName}, + post_sort = #{postSort}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where post_id = #{postId} + + + + insert into sys_post( + post_id, + post_code, + post_name, + post_sort, + status, + remark, + create_by, + create_time + )values( + #{postId}, + #{postCode}, + #{postName}, + #{postSort}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + + + delete + from sys_post + where post_id = #{postId} + + + + delete from sys_post where post_id in + + #{postId} + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml index 7c4139b..5e82f9f 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -1,34 +1,38 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - + + + + + + + delete + from sys_role_dept + where role_id = #{roleId} + + + + + + delete from sys_role_dept where role_id in + + #{roleId} + + + + + insert into sys_role_dept(role_id, dept_id) values + + (#{item.roleId},#{item.deptId}) + + - - delete from sys_role_dept where role_id=#{roleId} - - - - - - delete from sys_role_dept where role_id in - - #{roleId} - - - - - insert into sys_role_dept(role_id, dept_id) values - - (#{item.roleId},#{item.deptId}) - - - \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml index 52306c2..52f7b28 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -1,152 +1,164 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly, - r.status, r.del_flag, r.create_time, r.remark + + + + + + + + + + + + + + + + + + + select distinct r.role_id, + r.role_name, + r.role_key, + r.role_sort, + r.data_scope, + r.menu_check_strictly, + r.dept_check_strictly, + r.status, + r.del_flag, + r.create_time, + r.remark from sys_role r - left join sys_user_role ur on ur.role_id = r.role_id - left join sys_user u on u.user_id = ur.user_id - left join sys_dept d on u.dept_id = d.dept_id + left join sys_user_role ur on ur.role_id = r.role_id + left join sys_user u on u.user_id = ur.user_id + left join sys_dept d on u.dept_id = d.dept_id - - - - - - - - + + where r.del_flag = '0' + + AND r.role_id = #{roleId} + + + AND r.role_name like concat('%', #{roleName}, '%') + + + AND r.status = #{status} + + + AND r.role_key like concat('%', #{roleKey}, '%') + + + and date_format(r.create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') + + + and date_format(r.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') + + + ${params.dataScope} + order by r.role_sort + + + + + + + - - - - - - - - - - - insert into sys_role( - role_id, - role_name, - role_key, - role_sort, - data_scope, - menu_check_strictly, - dept_check_strictly, - status, - remark, - create_by, - create_time - )values( - #{roleId}, - #{roleName}, - #{roleKey}, - #{roleSort}, - #{dataScope}, - #{menuCheckStrictly}, - #{deptCheckStrictly}, - #{status}, - #{remark}, - #{createBy}, - sysdate() - ) - - - - update sys_role - - role_name = #{roleName}, - role_key = #{roleKey}, - role_sort = #{roleSort}, - data_scope = #{dataScope}, - menu_check_strictly = #{menuCheckStrictly}, - dept_check_strictly = #{deptCheckStrictly}, - status = #{status}, - remark = #{remark}, - update_by = #{updateBy}, - update_time = sysdate() - - where role_id = #{roleId} - - - - update sys_role set del_flag = '2' where role_id = #{roleId} - - - - update sys_role set del_flag = '2' where role_id in - - #{roleId} - - - + left join sys_user_role ur on ur.role_id = r.role_id + left join sys_user u on u.user_id = ur.user_id + where u.user_id = #{userId} + + + + + + + + + + + + insert into sys_role( + role_id, + role_name, + role_key, + role_sort, + data_scope, + menu_check_strictly, + dept_check_strictly, + status, + remark, + create_by, + create_time + )values( + #{roleId}, + #{roleName}, + #{roleKey}, + #{roleSort}, + #{dataScope}, + #{menuCheckStrictly}, + #{deptCheckStrictly}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + + + update sys_role + + role_name = #{roleName}, + role_key = #{roleKey}, + role_sort = #{roleSort}, + data_scope = #{dataScope}, + menu_check_strictly = #{menuCheckStrictly}, + dept_check_strictly = #{deptCheckStrictly}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where role_id = #{roleId} + + + + update sys_role + set del_flag = '2' + where role_id = #{roleId} + + + + update sys_role set del_flag = '2' where role_id in + + #{roleId} + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml index cb60a85..49dbdbd 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -1,34 +1,38 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - + + + + + + + + + delete + from sys_role_menu + where role_id = #{roleId} + + + + delete from sys_role_menu where role_id in + + #{roleId} + + + + + insert into sys_role_menu(role_id, menu_id) values + + (#{item.roleId},#{item.menuId}) + + - - delete from sys_role_menu where role_id=#{roleId} - - - - delete from sys_role_menu where role_id in - - #{roleId} - - - - - insert into sys_role_menu(role_id, menu_id) values - - (#{item.roleId},#{item.menuId}) - - - \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index eca3694..c038083 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -1,221 +1,274 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, - d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, - r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status + + + select u.user_id, + u.dept_id, + u.user_name, + u.nick_name, + u.email, + u.avatar, + u.phonenumber, + u.password, + u.sex, + u.status, + u.del_flag, + u.login_ip, + u.login_date, + u.create_by, + u.create_time, + u.remark, + d.dept_id, + d.parent_id, + d.ancestors, + d.dept_name, + d.order_num, + d.leader, + d.status as dept_status, + r.role_id, + r.role_name, + r.role_key, + r.role_sort, + r.data_scope, + r.status as role_status from sys_user u - left join sys_dept d on u.dept_id = d.dept_id - left join sys_user_role ur on u.user_id = ur.user_id - left join sys_role r on r.role_id = ur.role_id + left join sys_dept d on u.dept_id = d.dept_id + left join sys_user_role ur on u.user_id = ur.user_id + left join sys_role r on r.role_id = ur.role_id - - - - - - - - - - - - - - - - - - - insert into sys_user( - user_id, - dept_id, - user_name, - nick_name, - email, - avatar, - phonenumber, - sex, - password, - status, - create_by, - remark, - create_time - )values( - #{userId}, - #{deptId}, - #{userName}, - #{nickName}, - #{email}, - #{avatar}, - #{phonenumber}, - #{sex}, - #{password}, - #{status}, - #{createBy}, - #{remark}, - sysdate() - ) - - - - update sys_user - - dept_id = #{deptId}, - user_name = #{userName}, - nick_name = #{nickName}, - email = #{email}, - phonenumber = #{phonenumber}, - sex = #{sex}, - avatar = #{avatar}, - password = #{password}, - status = #{status}, - login_ip = #{loginIp}, - login_date = #{loginDate}, - update_by = #{updateBy}, - remark = #{remark}, - update_time = sysdate() - - where user_id = #{userId} - - - - update sys_user set status = #{status} where user_id = #{userId} - - - - update sys_user set avatar = #{avatar} where user_name = #{userName} - - - - update sys_user set password = #{password} where user_name = #{userName} - - - - update sys_user set del_flag = '2' where user_id = #{userId} - - - - update sys_user set del_flag = '2' where user_id in - - #{userId} - - - + + + + + + + + + + + + + + + + + + + insert into sys_user( + user_id, + dept_id, + user_name, + nick_name, + email, + avatar, + phonenumber, + sex, + password, + status, + create_by, + remark, + create_time + )values( + #{userId}, + #{deptId}, + #{userName}, + #{nickName}, + #{email}, + #{avatar}, + #{phonenumber}, + #{sex}, + #{password}, + #{status}, + #{createBy}, + #{remark}, + sysdate() + ) + + + + update sys_user + + dept_id = #{deptId}, + user_name = #{userName}, + nick_name = #{nickName}, + email = #{email}, + phonenumber = #{phonenumber}, + sex = #{sex}, + avatar = #{avatar}, + password = #{password}, + status = #{status}, + login_ip = #{loginIp}, + login_date = #{loginDate}, + update_by = #{updateBy}, + remark = #{remark}, + update_time = sysdate() + + where user_id = #{userId} + + + + update sys_user + set status = #{status} + where user_id = #{userId} + + + + update sys_user + set avatar = #{avatar} + where user_name = #{userName} + + + + update sys_user + set password = #{password} + where user_name = #{userName} + + + + update sys_user + set del_flag = '2' + where user_id = #{userId} + + + + update sys_user set del_flag = '2' where user_id in + + #{userId} + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml index 2b90bc4..37eac8b 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -1,34 +1,38 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - + + + + + + + delete + from sys_user_post + where user_id = #{userId} + + + + + + delete from sys_user_post where user_id in + + #{userId} + + + + + insert into sys_user_post(user_id, post_id) values + + (#{item.userId},#{item.postId}) + + - - delete from sys_user_post where user_id=#{userId} - - - - - - delete from sys_user_post where user_id in - - #{userId} - - - - - insert into sys_user_post(user_id, post_id) values - - (#{item.userId},#{item.postId}) - - - \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml index dd72689..0c96069 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -1,44 +1,51 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - + + + + - - delete from sys_user_role where user_id=#{userId} - - - - - - delete from sys_user_role where user_id in - - #{userId} - - - - - insert into sys_user_role(user_id, role_id) values - - (#{item.userId},#{item.roleId}) - - - - - delete from sys_user_role where user_id=#{userId} and role_id=#{roleId} - - - - delete from sys_user_role where role_id=#{roleId} and user_id in - - #{userId} - - + + delete + from sys_user_role + where user_id = #{userId} + + + + + + delete from sys_user_role where user_id in + + #{userId} + + + + + insert into sys_user_role(user_id, role_id) values + + (#{item.userId},#{item.roleId}) + + + + + delete + from sys_user_role + where user_id = #{userId} + and role_id = #{roleId} + + + + delete from sys_user_role where role_id=#{roleId} and user_id in + + #{userId} + + \ No newline at end of file diff --git a/ruoyi-ui/.editorconfig b/ruoyi-ui/.editorconfig deleted file mode 100644 index 7034f9b..0000000 --- a/ruoyi-ui/.editorconfig +++ /dev/null @@ -1,22 +0,0 @@ -# 鍛婅瘔EditorConfig鎻掍欢锛岃繖鏄牴鏂囦欢锛屼笉鐢ㄧ户缁線涓婃煡鎵 -root = true - -# 鍖归厤鍏ㄩ儴鏂囦欢 -[*] -# 璁剧疆瀛楃闆 -charset = utf-8 -# 缂╄繘椋庢牸锛屽彲閫塻pace銆乼ab -indent_style = space -# 缂╄繘鐨勭┖鏍兼暟 -indent_size = 2 -# 缁撳熬鎹㈣绗︼紝鍙塴f銆乧r銆乧rlf -end_of_line = lf -# 鍦ㄦ枃浠剁粨灏炬彃鍏ユ柊琛 -insert_final_newline = true -# 鍒犻櫎涓琛屼腑鐨勫墠鍚庣┖鏍 -trim_trailing_whitespace = true - -# 鍖归厤md缁撳熬鐨勬枃浠 -[*.md] -insert_final_newline = false -trim_trailing_whitespace = false diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development deleted file mode 100644 index 302ecd1..0000000 --- a/ruoyi-ui/.env.development +++ /dev/null @@ -1,11 +0,0 @@ -# 椤甸潰鏍囬 -VUE_APP_TITLE = 鑻ヤ緷绠$悊绯荤粺 - -# 寮鍙戠幆澧冮厤缃 -ENV = 'development' - -# 鑻ヤ緷绠$悊绯荤粺/寮鍙戠幆澧 -VUE_APP_BASE_API = '/dev-api' - -# 璺敱鎳掑姞杞 -VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production deleted file mode 100644 index b4893b0..0000000 --- a/ruoyi-ui/.env.production +++ /dev/null @@ -1,8 +0,0 @@ -# 椤甸潰鏍囬 -VUE_APP_TITLE = 鑻ヤ緷绠$悊绯荤粺 - -# 鐢熶骇鐜閰嶇疆 -ENV = 'production' - -# 鑻ヤ緷绠$悊绯荤粺/鐢熶骇鐜 -VUE_APP_BASE_API = '/prod-api' diff --git a/ruoyi-ui/.env.staging b/ruoyi-ui/.env.staging deleted file mode 100644 index 361859f..0000000 --- a/ruoyi-ui/.env.staging +++ /dev/null @@ -1,10 +0,0 @@ -# 椤甸潰鏍囬 -VUE_APP_TITLE = 鑻ヤ緷绠$悊绯荤粺 - -NODE_ENV = production - -# 娴嬭瘯鐜閰嶇疆 -ENV = 'staging' - -# 鑻ヤ緷绠$悊绯荤粺/娴嬭瘯鐜 -VUE_APP_BASE_API = '/stage-api' diff --git a/ruoyi-ui/.eslintignore b/ruoyi-ui/.eslintignore deleted file mode 100644 index 89be6f6..0000000 --- a/ruoyi-ui/.eslintignore +++ /dev/null @@ -1,10 +0,0 @@ -# 蹇界暐build鐩綍涓嬬被鍨嬩负js鐨勬枃浠剁殑璇硶妫鏌 -build/*.js -# 蹇界暐src/assets鐩綍涓嬫枃浠剁殑璇硶妫鏌 -src/assets -# 蹇界暐public鐩綍涓嬫枃浠剁殑璇硶妫鏌 -public -# 蹇界暐褰撳墠鐩綍涓嬩负js鐨勬枃浠剁殑璇硶妫鏌 -*.js -# 蹇界暐褰撳墠鐩綍涓嬩负vue鐨勬枃浠剁殑璇硶妫鏌 -*.vue \ No newline at end of file diff --git a/ruoyi-ui/.eslintrc.js b/ruoyi-ui/.eslintrc.js deleted file mode 100644 index 82bbdee..0000000 --- a/ruoyi-ui/.eslintrc.js +++ /dev/null @@ -1,199 +0,0 @@ -// ESlint 妫鏌ラ厤缃 -module.exports = { - root: true, - parserOptions: { - parser: 'babel-eslint', - sourceType: 'module' - }, - env: { - browser: true, - node: true, - es6: true, - }, - extends: ['plugin:vue/recommended', 'eslint:recommended'], - - // add your custom rules here - //it is base on https://github.com/vuejs/eslint-config-vue - rules: { - "vue/max-attributes-per-line": [2, { - "singleline": 10, - "multiline": { - "max": 1, - "allowFirstLine": false - } - }], - "vue/singleline-html-element-content-newline": "off", - "vue/multiline-html-element-content-newline":"off", - "vue/name-property-casing": ["error", "PascalCase"], - "vue/no-v-html": "off", - 'accessor-pairs': 2, - 'arrow-spacing': [2, { - 'before': true, - 'after': true - }], - 'block-spacing': [2, 'always'], - 'brace-style': [2, '1tbs', { - 'allowSingleLine': true - }], - 'camelcase': [0, { - 'properties': 'always' - }], - 'comma-dangle': [2, 'never'], - 'comma-spacing': [2, { - 'before': false, - 'after': true - }], - 'comma-style': [2, 'last'], - 'constructor-super': 2, - 'curly': [2, 'multi-line'], - 'dot-location': [2, 'property'], - 'eol-last': 2, - 'eqeqeq': ["error", "always", {"null": "ignore"}], - 'generator-star-spacing': [2, { - 'before': true, - 'after': true - }], - 'handle-callback-err': [2, '^(err|error)$'], - 'indent': [2, 2, { - 'SwitchCase': 1 - }], - 'jsx-quotes': [2, 'prefer-single'], - 'key-spacing': [2, { - 'beforeColon': false, - 'afterColon': true - }], - 'keyword-spacing': [2, { - 'before': true, - 'after': true - }], - 'new-cap': [2, { - 'newIsCap': true, - 'capIsNew': false - }], - 'new-parens': 2, - 'no-array-constructor': 2, - 'no-caller': 2, - 'no-console': 'off', - 'no-class-assign': 2, - 'no-cond-assign': 2, - 'no-const-assign': 2, - 'no-control-regex': 0, - 'no-delete-var': 2, - 'no-dupe-args': 2, - 'no-dupe-class-members': 2, - 'no-dupe-keys': 2, - 'no-duplicate-case': 2, - 'no-empty-character-class': 2, - 'no-empty-pattern': 2, - 'no-eval': 2, - 'no-ex-assign': 2, - 'no-extend-native': 2, - 'no-extra-bind': 2, - 'no-extra-boolean-cast': 2, - 'no-extra-parens': [2, 'functions'], - 'no-fallthrough': 2, - 'no-floating-decimal': 2, - 'no-func-assign': 2, - 'no-implied-eval': 2, - 'no-inner-declarations': [2, 'functions'], - 'no-invalid-regexp': 2, - 'no-irregular-whitespace': 2, - 'no-iterator': 2, - 'no-label-var': 2, - 'no-labels': [2, { - 'allowLoop': false, - 'allowSwitch': false - }], - 'no-lone-blocks': 2, - 'no-mixed-spaces-and-tabs': 2, - 'no-multi-spaces': 2, - 'no-multi-str': 2, - 'no-multiple-empty-lines': [2, { - 'max': 1 - }], - 'no-native-reassign': 2, - 'no-negated-in-lhs': 2, - 'no-new-object': 2, - 'no-new-require': 2, - 'no-new-symbol': 2, - 'no-new-wrappers': 2, - 'no-obj-calls': 2, - 'no-octal': 2, - 'no-octal-escape': 2, - 'no-path-concat': 2, - 'no-proto': 2, - 'no-redeclare': 2, - 'no-regex-spaces': 2, - 'no-return-assign': [2, 'except-parens'], - 'no-self-assign': 2, - 'no-self-compare': 2, - 'no-sequences': 2, - 'no-shadow-restricted-names': 2, - 'no-spaced-func': 2, - 'no-sparse-arrays': 2, - 'no-this-before-super': 2, - 'no-throw-literal': 2, - 'no-trailing-spaces': 2, - 'no-undef': 2, - 'no-undef-init': 2, - 'no-unexpected-multiline': 2, - 'no-unmodified-loop-condition': 2, - 'no-unneeded-ternary': [2, { - 'defaultAssignment': false - }], - 'no-unreachable': 2, - 'no-unsafe-finally': 2, - 'no-unused-vars': [2, { - 'vars': 'all', - 'args': 'none' - }], - 'no-useless-call': 2, - 'no-useless-computed-key': 2, - 'no-useless-constructor': 2, - 'no-useless-escape': 0, - 'no-whitespace-before-property': 2, - 'no-with': 2, - 'one-var': [2, { - 'initialized': 'never' - }], - 'operator-linebreak': [2, 'after', { - 'overrides': { - '?': 'before', - ':': 'before' - } - }], - 'padded-blocks': [2, 'never'], - 'quotes': [2, 'single', { - 'avoidEscape': true, - 'allowTemplateLiterals': true - }], - 'semi': [2, 'never'], - 'semi-spacing': [2, { - 'before': false, - 'after': true - }], - 'space-before-blocks': [2, 'always'], - 'space-before-function-paren': [2, 'never'], - 'space-in-parens': [2, 'never'], - 'space-infix-ops': 2, - 'space-unary-ops': [2, { - 'words': true, - 'nonwords': false - }], - 'spaced-comment': [2, 'always', { - 'markers': ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ','] - }], - 'template-curly-spacing': [2, 'never'], - 'use-isnan': 2, - 'valid-typeof': 2, - 'wrap-iife': [2, 'any'], - 'yield-star-spacing': [2, 'both'], - 'yoda': [2, 'never'], - 'prefer-const': 2, - 'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0, - 'object-curly-spacing': [2, 'always', { - objectsInObjects: false - }], - 'array-bracket-spacing': [2, 'never'] - } -} diff --git a/ruoyi-ui/.gitignore b/ruoyi-ui/.gitignore deleted file mode 100644 index 78a752d..0000000 --- a/ruoyi-ui/.gitignore +++ /dev/null @@ -1,23 +0,0 @@ -.DS_Store -node_modules/ -dist/ -npm-debug.log* -yarn-debug.log* -yarn-error.log* -**/*.log - -tests/**/coverage/ -tests/e2e/reports -selenium-debug.log - -# Editor directories and files -.idea -.vscode -*.suo -*.ntvs* -*.njsproj -*.sln -*.local - -package-lock.json -yarn.lock diff --git a/ruoyi-ui/README.md b/ruoyi-ui/README.md deleted file mode 100644 index 00c0ab8..0000000 --- a/ruoyi-ui/README.md +++ /dev/null @@ -1,30 +0,0 @@ -## 寮鍙 - -```bash -# 鍏嬮殕椤圭洰 -git clone https://gitee.com/y_project/RuoYi-Vue - -# 杩涘叆椤圭洰鐩綍 -cd ruoyi-ui - -# 瀹夎渚濊禆 -npm install - -# 寤鸿涓嶈鐩存帴浣跨敤 cnpm 瀹夎渚濊禆锛屼細鏈夊悇绉嶈寮傜殑 bug銆傚彲浠ラ氳繃濡備笅鎿嶄綔瑙e喅 npm 涓嬭浇閫熷害鎱㈢殑闂 -npm install --registry=https://registry.npmmirror.com - -# 鍚姩鏈嶅姟 -npm run dev -``` - -娴忚鍣ㄨ闂 http://localhost:80 - -## 鍙戝竷 - -```bash -# 鏋勫缓娴嬭瘯鐜 -npm run build:stage - -# 鏋勫缓鐢熶骇鐜 -npm run build:prod -``` \ No newline at end of file diff --git a/ruoyi-ui/babel.config.js b/ruoyi-ui/babel.config.js deleted file mode 100644 index c8267b2..0000000 --- a/ruoyi-ui/babel.config.js +++ /dev/null @@ -1,13 +0,0 @@ -module.exports = { - presets: [ - // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app - '@vue/cli-plugin-babel/preset' - ], - 'env': { - 'development': { - // babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require(). - // This plugin can significantly increase the speed of hot updates, when you have a large number of pages. - 'plugins': ['dynamic-import-node'] - } - } -} \ No newline at end of file diff --git a/ruoyi-ui/bin/build.bat b/ruoyi-ui/bin/build.bat deleted file mode 100644 index dda590d..0000000 --- a/ruoyi-ui/bin/build.bat +++ /dev/null @@ -1,12 +0,0 @@ -@echo off -echo. -echo [信息] 打包Web工程,生成dist文件。 -echo. - -%~d0 -cd %~dp0 - -cd .. -npm run build:prod - -pause \ No newline at end of file diff --git a/ruoyi-ui/bin/package.bat b/ruoyi-ui/bin/package.bat deleted file mode 100644 index 0e5bc0f..0000000 --- a/ruoyi-ui/bin/package.bat +++ /dev/null @@ -1,12 +0,0 @@ -@echo off -echo. -echo [信息] 安装Web工程,生成node_modules文件。 -echo. - -%~d0 -cd %~dp0 - -cd .. -npm install --registry=https://registry.npmmirror.com - -pause \ No newline at end of file diff --git a/ruoyi-ui/bin/run-web.bat b/ruoyi-ui/bin/run-web.bat deleted file mode 100644 index d30deae..0000000 --- a/ruoyi-ui/bin/run-web.bat +++ /dev/null @@ -1,12 +0,0 @@ -@echo off -echo. -echo [信息] 使用 Vue CLI 命令运行 Web 工程。 -echo. - -%~d0 -cd %~dp0 - -cd .. -npm run dev - -pause \ No newline at end of file diff --git a/ruoyi-ui/build/index.js b/ruoyi-ui/build/index.js deleted file mode 100644 index 0c57de2..0000000 --- a/ruoyi-ui/build/index.js +++ /dev/null @@ -1,35 +0,0 @@ -const { run } = require('runjs') -const chalk = require('chalk') -const config = require('../vue.config.js') -const rawArgv = process.argv.slice(2) -const args = rawArgv.join(' ') - -if (process.env.npm_config_preview || rawArgv.includes('--preview')) { - const report = rawArgv.includes('--report') - - run(`vue-cli-service build ${args}`) - - const port = 9526 - const publicPath = config.publicPath - - var connect = require('connect') - var serveStatic = require('serve-static') - const app = connect() - - app.use( - publicPath, - serveStatic('./dist', { - index: ['index.html', '/'] - }) - ) - - app.listen(port, function () { - console.log(chalk.green(`> Preview at http://localhost:${port}${publicPath}`)) - if (report) { - console.log(chalk.green(`> Report at http://localhost:${port}${publicPath}report.html`)) - } - - }) -} else { - run(`vue-cli-service build ${args}`) -} diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json deleted file mode 100644 index 2e4b91e..0000000 --- a/ruoyi-ui/package.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "name": "ruoyi", - "version": "3.8.7", - "description": "鑻ヤ緷绠$悊绯荤粺", - "author": "鑻ヤ緷", - "license": "MIT", - "scripts": { - "dev": "vue-cli-service serve", - "build:prod": "vue-cli-service build", - "build:stage": "vue-cli-service build --mode staging", - "preview": "node build/index.js --preview", - "lint": "eslint --ext .js,.vue src" - }, - "husky": { - "hooks": { - "pre-commit": "lint-staged" - } - }, - "lint-staged": { - "src/**/*.{js,vue}": [ - "eslint --fix", - "git add" - ] - }, - "keywords": [ - "vue", - "admin", - "dashboard", - "element-ui", - "boilerplate", - "admin-template", - "management-system" - ], - "repository": { - "type": "git", - "url": "https://gitee.com/y_project/RuoYi-Vue.git" - }, - "dependencies": { - "@riophae/vue-treeselect": "0.4.0", - "axios": "0.24.0", - "clipboard": "2.0.8", - "core-js": "3.25.3", - "echarts": "5.4.0", - "element-ui": "2.15.14", - "file-saver": "2.0.5", - "fuse.js": "6.4.3", - "highlight.js": "9.18.5", - "js-beautify": "1.13.0", - "js-cookie": "3.0.1", - "jsencrypt": "3.0.0-rc.1", - "nprogress": "0.2.0", - "quill": "1.3.7", - "screenfull": "5.0.2", - "sortablejs": "1.10.2", - "vue": "2.6.12", - "vue-count-to": "1.0.13", - "vue-cropper": "0.5.5", - "vue-meta": "2.4.0", - "vue-router": "3.4.9", - "vuedraggable": "2.24.3", - "vuex": "3.6.0" - }, - "devDependencies": { - "@vue/cli-plugin-babel": "4.4.6", - "@vue/cli-plugin-eslint": "4.4.6", - "@vue/cli-service": "4.4.6", - "babel-eslint": "10.1.0", - "babel-plugin-dynamic-import-node": "2.3.3", - "chalk": "4.1.0", - "compression-webpack-plugin": "6.1.2", - "connect": "3.6.6", - "eslint": "7.15.0", - "eslint-plugin-vue": "7.2.0", - "lint-staged": "10.5.3", - "runjs": "4.4.2", - "sass": "1.32.13", - "sass-loader": "10.1.1", - "script-ext-html-webpack-plugin": "2.1.5", - "svg-sprite-loader": "5.1.1", - "vue-template-compiler": "2.6.12" - }, - "engines": { - "node": ">=8.9", - "npm": ">= 3.0.0" - }, - "browserslist": [ - "> 1%", - "last 2 versions" - ] -} diff --git a/ruoyi-ui/public/favicon.ico b/ruoyi-ui/public/favicon.ico deleted file mode 100644 index e263760..0000000 Binary files a/ruoyi-ui/public/favicon.ico and /dev/null differ diff --git a/ruoyi-ui/public/html/ie.html b/ruoyi-ui/public/html/ie.html deleted file mode 100644 index 052ffcd..0000000 --- a/ruoyi-ui/public/html/ie.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - 璇峰崌绾ф偍鐨勬祻瑙堝櫒 - - - - - - -

璇峰崌绾ф偍鐨勬祻瑙堝櫒锛屼互渚挎垜浠洿濂界殑涓烘偍鎻愪緵鏈嶅姟锛

-

鎮ㄦ鍦ㄤ娇鐢 Internet Explorer 鐨勬棭鏈熺増鏈紙IE11浠ヤ笅鐗堟湰鎴栦娇鐢ㄨ鍐呮牳鐨勬祻瑙堝櫒锛夈傝繖鎰忓懗鐫鍦ㄥ崌绾ф祻瑙堝櫒鍓嶏紝鎮ㄥ皢鏃犳硶璁块棶姝ょ綉绔欍

-
-

璇锋敞鎰忥細寰蒋鍏徃瀵筗indows XP 鍙 Internet Explorer 鏃╂湡鐗堟湰鐨勬敮鎸佸凡缁忕粨鏉

-

鑷 2016 骞 1 鏈 12 鏃ヨ捣锛孧icrosoft 涓嶅啀涓 IE 11 浠ヤ笅鐗堟湰鎻愪緵鐩稿簲鏀寔鍜屾洿鏂般傛病鏈夊叧閿殑娴忚鍣ㄥ畨鍏ㄦ洿鏂帮紝鎮ㄧ殑鐢佃剳鍙兘鏄撳彈鏈夊鐥呮瘨銆侀棿璋嶈蒋浠跺拰鍏朵粬鎭舵剰杞欢鐨勬敾鍑伙紝瀹冧滑鍙互绐冨彇鎴栨崯瀹虫偍鐨勪笟鍔℃暟鎹拰淇℃伅銆傝鍙傞槄 寰蒋瀵 Internet Explorer 鏃╂湡鐗堟湰鐨勬敮鎸佸皢浜 2016 骞 1 鏈 12 鏃ョ粨鏉熺殑璇存槑

-
-

鎮ㄥ彲浠ラ夋嫨鏇村厛杩涚殑娴忚鍣

-

鎺ㄨ崘浣跨敤浠ヤ笅娴忚鍣ㄧ殑鏈鏂扮増鏈傚鏋滄偍鐨勭數鑴戝凡鏈変互涓嬫祻瑙堝櫒鐨勬渶鏂扮増鏈垯鐩存帴浣跨敤璇ユ祻瑙堝櫒璁块棶鍗冲彲銆

- -
- - \ No newline at end of file diff --git a/ruoyi-ui/public/index.html b/ruoyi-ui/public/index.html deleted file mode 100644 index 925455c..0000000 --- a/ruoyi-ui/public/index.html +++ /dev/null @@ -1,208 +0,0 @@ - - - - - - - - - <%= webpackConfig.name %> - - - - -
-
-
-
-
-
姝e湪鍔犺浇绯荤粺璧勬簮锛岃鑰愬績绛夊緟
-
-
- - diff --git a/ruoyi-ui/public/robots.txt b/ruoyi-ui/public/robots.txt deleted file mode 100644 index 77470cb..0000000 --- a/ruoyi-ui/public/robots.txt +++ /dev/null @@ -1,2 +0,0 @@ -User-agent: * -Disallow: / \ No newline at end of file diff --git a/ruoyi-ui/src/App.vue b/ruoyi-ui/src/App.vue deleted file mode 100644 index b92ea37..0000000 --- a/ruoyi-ui/src/App.vue +++ /dev/null @@ -1,28 +0,0 @@ - - - - diff --git a/ruoyi-ui/src/api/login.js b/ruoyi-ui/src/api/login.js deleted file mode 100644 index 7b7388f..0000000 --- a/ruoyi-ui/src/api/login.js +++ /dev/null @@ -1,60 +0,0 @@ -import request from '@/utils/request' - -// 鐧诲綍鏂规硶 -export function login(username, password, code, uuid) { - const data = { - username, - password, - code, - uuid - } - return request({ - url: '/login', - headers: { - isToken: false, - repeatSubmit: false - }, - method: 'post', - data: data - }) -} - -// 娉ㄥ唽鏂规硶 -export function register(data) { - return request({ - url: '/register', - headers: { - isToken: false - }, - method: 'post', - data: data - }) -} - -// 鑾峰彇鐢ㄦ埛璇︾粏淇℃伅 -export function getInfo() { - return request({ - url: '/getInfo', - method: 'get' - }) -} - -// 閫鍑烘柟娉 -export function logout() { - return request({ - url: '/logout', - method: 'post' - }) -} - -// 鑾峰彇楠岃瘉鐮 -export function getCodeImg() { - return request({ - url: '/captchaImage', - headers: { - isToken: false - }, - method: 'get', - timeout: 20000 - }) -} \ No newline at end of file diff --git a/ruoyi-ui/src/api/menu.js b/ruoyi-ui/src/api/menu.js deleted file mode 100644 index faef101..0000000 --- a/ruoyi-ui/src/api/menu.js +++ /dev/null @@ -1,9 +0,0 @@ -import request from '@/utils/request' - -// 鑾峰彇璺敱 -export const getRouters = () => { - return request({ - url: '/getRouters', - method: 'get' - }) -} \ No newline at end of file diff --git a/ruoyi-ui/src/api/monitor/cache.js b/ruoyi-ui/src/api/monitor/cache.js deleted file mode 100644 index 72c5f6a..0000000 --- a/ruoyi-ui/src/api/monitor/cache.js +++ /dev/null @@ -1,57 +0,0 @@ -import request from '@/utils/request' - -// 鏌ヨ缂撳瓨璇︾粏 -export function getCache() { - return request({ - url: '/monitor/cache', - method: 'get' - }) -} - -// 鏌ヨ缂撳瓨鍚嶇О鍒楄〃 -export function listCacheName() { - return request({ - url: '/monitor/cache/getNames', - method: 'get' - }) -} - -// 鏌ヨ缂撳瓨閿悕鍒楄〃 -export function listCacheKey(cacheName) { - return request({ - url: '/monitor/cache/getKeys/' + cacheName, - method: 'get' - }) -} - -// 鏌ヨ缂撳瓨鍐呭 -export function getCacheValue(cacheName, cacheKey) { - return request({ - url: '/monitor/cache/getValue/' + cacheName + '/' + cacheKey, - method: 'get' - }) -} - -// 娓呯悊鎸囧畾鍚嶇О缂撳瓨 -export function clearCacheName(cacheName) { - return request({ - url: '/monitor/cache/clearCacheName/' + cacheName, - method: 'delete' - }) -} - -// 娓呯悊鎸囧畾閿悕缂撳瓨 -export function clearCacheKey(cacheKey) { - return request({ - url: '/monitor/cache/clearCacheKey/' + cacheKey, - method: 'delete' - }) -} - -// 娓呯悊鍏ㄩ儴缂撳瓨 -export function clearCacheAll() { - return request({ - url: '/monitor/cache/clearCacheAll', - method: 'delete' - }) -} diff --git a/ruoyi-ui/src/api/monitor/job.js b/ruoyi-ui/src/api/monitor/job.js deleted file mode 100644 index 3815569..0000000 --- a/ruoyi-ui/src/api/monitor/job.js +++ /dev/null @@ -1,71 +0,0 @@ -import request from '@/utils/request' - -// 鏌ヨ瀹氭椂浠诲姟璋冨害鍒楄〃 -export function listJob(query) { - return request({ - url: '/monitor/job/list', - method: 'get', - params: query - }) -} - -// 鏌ヨ瀹氭椂浠诲姟璋冨害璇︾粏 -export function getJob(jobId) { - return request({ - url: '/monitor/job/' + jobId, - method: 'get' - }) -} - -// 鏂板瀹氭椂浠诲姟璋冨害 -export function addJob(data) { - return request({ - url: '/monitor/job', - method: 'post', - data: data - }) -} - -// 淇敼瀹氭椂浠诲姟璋冨害 -export function updateJob(data) { - return request({ - url: '/monitor/job', - method: 'put', - data: data - }) -} - -// 鍒犻櫎瀹氭椂浠诲姟璋冨害 -export function delJob(jobId) { - return request({ - url: '/monitor/job/' + jobId, - method: 'delete' - }) -} - -// 浠诲姟鐘舵佷慨鏀 -export function changeJobStatus(jobId, status) { - const data = { - jobId, - status - } - return request({ - url: '/monitor/job/changeStatus', - method: 'put', - data: data - }) -} - - -// 瀹氭椂浠诲姟绔嬪嵆鎵ц涓娆 -export function runJob(jobId, jobGroup) { - const data = { - jobId, - jobGroup - } - return request({ - url: '/monitor/job/run', - method: 'put', - data: data - }) -} \ No newline at end of file diff --git a/ruoyi-ui/src/api/monitor/jobLog.js b/ruoyi-ui/src/api/monitor/jobLog.js deleted file mode 100644 index 6e0be61..0000000 --- a/ruoyi-ui/src/api/monitor/jobLog.js +++ /dev/null @@ -1,26 +0,0 @@ -import request from '@/utils/request' - -// 鏌ヨ璋冨害鏃ュ織鍒楄〃 -export function listJobLog(query) { - return request({ - url: '/monitor/jobLog/list', - method: 'get', - params: query - }) -} - -// 鍒犻櫎璋冨害鏃ュ織 -export function delJobLog(jobLogId) { - return request({ - url: '/monitor/jobLog/' + jobLogId, - method: 'delete' - }) -} - -// 娓呯┖璋冨害鏃ュ織 -export function cleanJobLog() { - return request({ - url: '/monitor/jobLog/clean', - method: 'delete' - }) -} diff --git a/ruoyi-ui/src/api/monitor/logininfor.js b/ruoyi-ui/src/api/monitor/logininfor.js deleted file mode 100644 index 4d112b7..0000000 --- a/ruoyi-ui/src/api/monitor/logininfor.js +++ /dev/null @@ -1,34 +0,0 @@ -import request from '@/utils/request' - -// 鏌ヨ鐧诲綍鏃ュ織鍒楄〃 -export function list(query) { - return request({ - url: '/monitor/logininfor/list', - method: 'get', - params: query - }) -} - -// 鍒犻櫎鐧诲綍鏃ュ織 -export function delLogininfor(infoId) { - return request({ - url: '/monitor/logininfor/' + infoId, - method: 'delete' - }) -} - -// 瑙i攣鐢ㄦ埛鐧诲綍鐘舵 -export function unlockLogininfor(userName) { - return request({ - url: '/monitor/logininfor/unlock/' + userName, - method: 'get' - }) -} - -// 娓呯┖鐧诲綍鏃ュ織 -export function cleanLogininfor() { - return request({ - url: '/monitor/logininfor/clean', - method: 'delete' - }) -} diff --git a/ruoyi-ui/src/api/monitor/online.js b/ruoyi-ui/src/api/monitor/online.js deleted file mode 100644 index bd22137..0000000 --- a/ruoyi-ui/src/api/monitor/online.js +++ /dev/null @@ -1,18 +0,0 @@ -import request from '@/utils/request' - -// 鏌ヨ鍦ㄧ嚎鐢ㄦ埛鍒楄〃 -export function list(query) { - return request({ - url: '/monitor/online/list', - method: 'get', - params: query - }) -} - -// 寮洪鐢ㄦ埛 -export function forceLogout(tokenId) { - return request({ - url: '/monitor/online/' + tokenId, - method: 'delete' - }) -} diff --git a/ruoyi-ui/src/api/monitor/operlog.js b/ruoyi-ui/src/api/monitor/operlog.js deleted file mode 100644 index a04bca8..0000000 --- a/ruoyi-ui/src/api/monitor/operlog.js +++ /dev/null @@ -1,26 +0,0 @@ -import request from '@/utils/request' - -// 鏌ヨ鎿嶄綔鏃ュ織鍒楄〃 -export function list(query) { - return request({ - url: '/monitor/operlog/list', - method: 'get', - params: query - }) -} - -// 鍒犻櫎鎿嶄綔鏃ュ織 -export function delOperlog(operId) { - return request({ - url: '/monitor/operlog/' + operId, - method: 'delete' - }) -} - -// 娓呯┖鎿嶄綔鏃ュ織 -export function cleanOperlog() { - return request({ - url: '/monitor/operlog/clean', - method: 'delete' - }) -} diff --git a/ruoyi-ui/src/api/monitor/server.js b/ruoyi-ui/src/api/monitor/server.js deleted file mode 100644 index e1f9ca2..0000000 --- a/ruoyi-ui/src/api/monitor/server.js +++ /dev/null @@ -1,9 +0,0 @@ -import request from '@/utils/request' - -// 鑾峰彇鏈嶅姟淇℃伅 -export function getServer() { - return request({ - url: '/monitor/server', - method: 'get' - }) -} \ No newline at end of file diff --git a/ruoyi-ui/src/api/system/config.js b/ruoyi-ui/src/api/system/config.js deleted file mode 100644 index a404d82..0000000 --- a/ruoyi-ui/src/api/system/config.js +++ /dev/null @@ -1,60 +0,0 @@ -import request from '@/utils/request' - -// 鏌ヨ鍙傛暟鍒楄〃 -export function listConfig(query) { - return request({ - url: '/system/config/list', - method: 'get', - params: query - }) -} - -// 鏌ヨ鍙傛暟璇︾粏 -export function getConfig(configId) { - return request({ - url: '/system/config/' + configId, - method: 'get' - }) -} - -// 鏍规嵁鍙傛暟閿悕鏌ヨ鍙傛暟鍊 -export function getConfigKey(configKey) { - return request({ - url: '/system/config/configKey/' + configKey, - method: 'get' - }) -} - -// 鏂板鍙傛暟閰嶇疆 -export function addConfig(data) { - return request({ - url: '/system/config', - method: 'post', - data: data - }) -} - -// 淇敼鍙傛暟閰嶇疆 -export function updateConfig(data) { - return request({ - url: '/system/config', - method: 'put', - data: data - }) -} - -// 鍒犻櫎鍙傛暟閰嶇疆 -export function delConfig(configId) { - return request({ - url: '/system/config/' + configId, - method: 'delete' - }) -} - -// 鍒锋柊鍙傛暟缂撳瓨 -export function refreshCache() { - return request({ - url: '/system/config/refreshCache', - method: 'delete' - }) -} diff --git a/ruoyi-ui/src/api/system/dept.js b/ruoyi-ui/src/api/system/dept.js deleted file mode 100644 index fc943cd..0000000 --- a/ruoyi-ui/src/api/system/dept.js +++ /dev/null @@ -1,52 +0,0 @@ -import request from '@/utils/request' - -// 鏌ヨ閮ㄩ棬鍒楄〃 -export function listDept(query) { - return request({ - url: '/system/dept/list', - method: 'get', - params: query - }) -} - -// 鏌ヨ閮ㄩ棬鍒楄〃锛堟帓闄よ妭鐐癸級 -export function listDeptExcludeChild(deptId) { - return request({ - url: '/system/dept/list/exclude/' + deptId, - method: 'get' - }) -} - -// 鏌ヨ閮ㄩ棬璇︾粏 -export function getDept(deptId) { - return request({ - url: '/system/dept/' + deptId, - method: 'get' - }) -} - -// 鏂板閮ㄩ棬 -export function addDept(data) { - return request({ - url: '/system/dept', - method: 'post', - data: data - }) -} - -// 淇敼閮ㄩ棬 -export function updateDept(data) { - return request({ - url: '/system/dept', - method: 'put', - data: data - }) -} - -// 鍒犻櫎閮ㄩ棬 -export function delDept(deptId) { - return request({ - url: '/system/dept/' + deptId, - method: 'delete' - }) -} \ No newline at end of file diff --git a/ruoyi-ui/src/api/system/dict/data.js b/ruoyi-ui/src/api/system/dict/data.js deleted file mode 100644 index 6c9eb79..0000000 --- a/ruoyi-ui/src/api/system/dict/data.js +++ /dev/null @@ -1,52 +0,0 @@ -import request from '@/utils/request' - -// 鏌ヨ瀛楀吀鏁版嵁鍒楄〃 -export function listData(query) { - return request({ - url: '/system/dict/data/list', - method: 'get', - params: query - }) -} - -// 鏌ヨ瀛楀吀鏁版嵁璇︾粏 -export function getData(dictCode) { - return request({ - url: '/system/dict/data/' + dictCode, - method: 'get' - }) -} - -// 鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁淇℃伅 -export function getDicts(dictType) { - return request({ - url: '/system/dict/data/type/' + dictType, - method: 'get' - }) -} - -// 鏂板瀛楀吀鏁版嵁 -export function addData(data) { - return request({ - url: '/system/dict/data', - method: 'post', - data: data - }) -} - -// 淇敼瀛楀吀鏁版嵁 -export function updateData(data) { - return request({ - url: '/system/dict/data', - method: 'put', - data: data - }) -} - -// 鍒犻櫎瀛楀吀鏁版嵁 -export function delData(dictCode) { - return request({ - url: '/system/dict/data/' + dictCode, - method: 'delete' - }) -} diff --git a/ruoyi-ui/src/api/system/dict/type.js b/ruoyi-ui/src/api/system/dict/type.js deleted file mode 100644 index a7a6e01..0000000 --- a/ruoyi-ui/src/api/system/dict/type.js +++ /dev/null @@ -1,60 +0,0 @@ -import request from '@/utils/request' - -// 鏌ヨ瀛楀吀绫诲瀷鍒楄〃 -export function listType(query) { - return request({ - url: '/system/dict/type/list', - method: 'get', - params: query - }) -} - -// 鏌ヨ瀛楀吀绫诲瀷璇︾粏 -export function getType(dictId) { - return request({ - url: '/system/dict/type/' + dictId, - method: 'get' - }) -} - -// 鏂板瀛楀吀绫诲瀷 -export function addType(data) { - return request({ - url: '/system/dict/type', - method: 'post', - data: data - }) -} - -// 淇敼瀛楀吀绫诲瀷 -export function updateType(data) { - return request({ - url: '/system/dict/type', - method: 'put', - data: data - }) -} - -// 鍒犻櫎瀛楀吀绫诲瀷 -export function delType(dictId) { - return request({ - url: '/system/dict/type/' + dictId, - method: 'delete' - }) -} - -// 鍒锋柊瀛楀吀缂撳瓨 -export function refreshCache() { - return request({ - url: '/system/dict/type/refreshCache', - method: 'delete' - }) -} - -// 鑾峰彇瀛楀吀閫夋嫨妗嗗垪琛 -export function optionselect() { - return request({ - url: '/system/dict/type/optionselect', - method: 'get' - }) -} \ No newline at end of file diff --git a/ruoyi-ui/src/api/system/menu.js b/ruoyi-ui/src/api/system/menu.js deleted file mode 100644 index f6415c6..0000000 --- a/ruoyi-ui/src/api/system/menu.js +++ /dev/null @@ -1,60 +0,0 @@ -import request from '@/utils/request' - -// 鏌ヨ鑿滃崟鍒楄〃 -export function listMenu(query) { - return request({ - url: '/system/menu/list', - method: 'get', - params: query - }) -} - -// 鏌ヨ鑿滃崟璇︾粏 -export function getMenu(menuId) { - return request({ - url: '/system/menu/' + menuId, - method: 'get' - }) -} - -// 鏌ヨ鑿滃崟涓嬫媺鏍戠粨鏋 -export function treeselect() { - return request({ - url: '/system/menu/treeselect', - method: 'get' - }) -} - -// 鏍规嵁瑙掕壊ID鏌ヨ鑿滃崟涓嬫媺鏍戠粨鏋 -export function roleMenuTreeselect(roleId) { - return request({ - url: '/system/menu/roleMenuTreeselect/' + roleId, - method: 'get' - }) -} - -// 鏂板鑿滃崟 -export function addMenu(data) { - return request({ - url: '/system/menu', - method: 'post', - data: data - }) -} - -// 淇敼鑿滃崟 -export function updateMenu(data) { - return request({ - url: '/system/menu', - method: 'put', - data: data - }) -} - -// 鍒犻櫎鑿滃崟 -export function delMenu(menuId) { - return request({ - url: '/system/menu/' + menuId, - method: 'delete' - }) -} \ No newline at end of file diff --git a/ruoyi-ui/src/api/system/notice.js b/ruoyi-ui/src/api/system/notice.js deleted file mode 100644 index c274ea5..0000000 --- a/ruoyi-ui/src/api/system/notice.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 鏌ヨ鍏憡鍒楄〃 -export function listNotice(query) { - return request({ - url: '/system/notice/list', - method: 'get', - params: query - }) -} - -// 鏌ヨ鍏憡璇︾粏 -export function getNotice(noticeId) { - return request({ - url: '/system/notice/' + noticeId, - method: 'get' - }) -} - -// 鏂板鍏憡 -export function addNotice(data) { - return request({ - url: '/system/notice', - method: 'post', - data: data - }) -} - -// 淇敼鍏憡 -export function updateNotice(data) { - return request({ - url: '/system/notice', - method: 'put', - data: data - }) -} - -// 鍒犻櫎鍏憡 -export function delNotice(noticeId) { - return request({ - url: '/system/notice/' + noticeId, - method: 'delete' - }) -} \ No newline at end of file diff --git a/ruoyi-ui/src/api/system/post.js b/ruoyi-ui/src/api/system/post.js deleted file mode 100644 index 1a8e9ca..0000000 --- a/ruoyi-ui/src/api/system/post.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 鏌ヨ宀椾綅鍒楄〃 -export function listPost(query) { - return request({ - url: '/system/post/list', - method: 'get', - params: query - }) -} - -// 鏌ヨ宀椾綅璇︾粏 -export function getPost(postId) { - return request({ - url: '/system/post/' + postId, - method: 'get' - }) -} - -// 鏂板宀椾綅 -export function addPost(data) { - return request({ - url: '/system/post', - method: 'post', - data: data - }) -} - -// 淇敼宀椾綅 -export function updatePost(data) { - return request({ - url: '/system/post', - method: 'put', - data: data - }) -} - -// 鍒犻櫎宀椾綅 -export function delPost(postId) { - return request({ - url: '/system/post/' + postId, - method: 'delete' - }) -} diff --git a/ruoyi-ui/src/api/system/role.js b/ruoyi-ui/src/api/system/role.js deleted file mode 100644 index f13e6f4..0000000 --- a/ruoyi-ui/src/api/system/role.js +++ /dev/null @@ -1,119 +0,0 @@ -import request from '@/utils/request' - -// 鏌ヨ瑙掕壊鍒楄〃 -export function listRole(query) { - return request({ - url: '/system/role/list', - method: 'get', - params: query - }) -} - -// 鏌ヨ瑙掕壊璇︾粏 -export function getRole(roleId) { - return request({ - url: '/system/role/' + roleId, - method: 'get' - }) -} - -// 鏂板瑙掕壊 -export function addRole(data) { - return request({ - url: '/system/role', - method: 'post', - data: data - }) -} - -// 淇敼瑙掕壊 -export function updateRole(data) { - return request({ - url: '/system/role', - method: 'put', - data: data - }) -} - -// 瑙掕壊鏁版嵁鏉冮檺 -export function dataScope(data) { - return request({ - url: '/system/role/dataScope', - method: 'put', - data: data - }) -} - -// 瑙掕壊鐘舵佷慨鏀 -export function changeRoleStatus(roleId, status) { - const data = { - roleId, - status - } - return request({ - url: '/system/role/changeStatus', - method: 'put', - data: data - }) -} - -// 鍒犻櫎瑙掕壊 -export function delRole(roleId) { - return request({ - url: '/system/role/' + roleId, - method: 'delete' - }) -} - -// 鏌ヨ瑙掕壊宸叉巿鏉冪敤鎴峰垪琛 -export function allocatedUserList(query) { - return request({ - url: '/system/role/authUser/allocatedList', - method: 'get', - params: query - }) -} - -// 鏌ヨ瑙掕壊鏈巿鏉冪敤鎴峰垪琛 -export function unallocatedUserList(query) { - return request({ - url: '/system/role/authUser/unallocatedList', - method: 'get', - params: query - }) -} - -// 鍙栨秷鐢ㄦ埛鎺堟潈瑙掕壊 -export function authUserCancel(data) { - return request({ - url: '/system/role/authUser/cancel', - method: 'put', - data: data - }) -} - -// 鎵归噺鍙栨秷鐢ㄦ埛鎺堟潈瑙掕壊 -export function authUserCancelAll(data) { - return request({ - url: '/system/role/authUser/cancelAll', - method: 'put', - params: data - }) -} - -// 鎺堟潈鐢ㄦ埛閫夋嫨 -export function authUserSelectAll(data) { - return request({ - url: '/system/role/authUser/selectAll', - method: 'put', - params: data - }) -} - -// 鏍规嵁瑙掕壊ID鏌ヨ閮ㄩ棬鏍戠粨鏋 -export function deptTreeSelect(roleId) { - return request({ - url: '/system/role/deptTree/' + roleId, - method: 'get' - }) -} diff --git a/ruoyi-ui/src/api/system/user.js b/ruoyi-ui/src/api/system/user.js deleted file mode 100644 index f2f76ef..0000000 --- a/ruoyi-ui/src/api/system/user.js +++ /dev/null @@ -1,135 +0,0 @@ -import request from '@/utils/request' -import { parseStrEmpty } from "@/utils/ruoyi"; - -// 鏌ヨ鐢ㄦ埛鍒楄〃 -export function listUser(query) { - return request({ - url: '/system/user/list', - method: 'get', - params: query - }) -} - -// 鏌ヨ鐢ㄦ埛璇︾粏 -export function getUser(userId) { - return request({ - url: '/system/user/' + parseStrEmpty(userId), - method: 'get' - }) -} - -// 鏂板鐢ㄦ埛 -export function addUser(data) { - return request({ - url: '/system/user', - method: 'post', - data: data - }) -} - -// 淇敼鐢ㄦ埛 -export function updateUser(data) { - return request({ - url: '/system/user', - method: 'put', - data: data - }) -} - -// 鍒犻櫎鐢ㄦ埛 -export function delUser(userId) { - return request({ - url: '/system/user/' + userId, - method: 'delete' - }) -} - -// 鐢ㄦ埛瀵嗙爜閲嶇疆 -export function resetUserPwd(userId, password) { - const data = { - userId, - password - } - return request({ - url: '/system/user/resetPwd', - method: 'put', - data: data - }) -} - -// 鐢ㄦ埛鐘舵佷慨鏀 -export function changeUserStatus(userId, status) { - const data = { - userId, - status - } - return request({ - url: '/system/user/changeStatus', - method: 'put', - data: data - }) -} - -// 鏌ヨ鐢ㄦ埛涓汉淇℃伅 -export function getUserProfile() { - return request({ - url: '/system/user/profile', - method: 'get' - }) -} - -// 淇敼鐢ㄦ埛涓汉淇℃伅 -export function updateUserProfile(data) { - return request({ - url: '/system/user/profile', - method: 'put', - data: data - }) -} - -// 鐢ㄦ埛瀵嗙爜閲嶇疆 -export function updateUserPwd(oldPassword, newPassword) { - const data = { - oldPassword, - newPassword - } - return request({ - url: '/system/user/profile/updatePwd', - method: 'put', - params: data - }) -} - -// 鐢ㄦ埛澶村儚涓婁紶 -export function uploadAvatar(data) { - return request({ - url: '/system/user/profile/avatar', - method: 'post', - data: data - }) -} - -// 鏌ヨ鎺堟潈瑙掕壊 -export function getAuthRole(userId) { - return request({ - url: '/system/user/authRole/' + userId, - method: 'get' - }) -} - -// 淇濆瓨鎺堟潈瑙掕壊 -export function updateAuthRole(data) { - return request({ - url: '/system/user/authRole', - method: 'put', - params: data - }) -} - -// 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋 -export function deptTreeSelect() { - return request({ - url: '/system/user/deptTree', - method: 'get' - }) -} diff --git a/ruoyi-ui/src/api/tool/gen.js b/ruoyi-ui/src/api/tool/gen.js deleted file mode 100644 index 2075677..0000000 --- a/ruoyi-ui/src/api/tool/gen.js +++ /dev/null @@ -1,85 +0,0 @@ -import request from '@/utils/request' - -// 鏌ヨ鐢熸垚琛ㄦ暟鎹 -export function listTable(query) { - return request({ - url: '/tool/gen/list', - method: 'get', - params: query - }) -} -// 鏌ヨdb鏁版嵁搴撳垪琛 -export function listDbTable(query) { - return request({ - url: '/tool/gen/db/list', - method: 'get', - params: query - }) -} - -// 鏌ヨ琛ㄨ缁嗕俊鎭 -export function getGenTable(tableId) { - return request({ - url: '/tool/gen/' + tableId, - method: 'get' - }) -} - -// 淇敼浠g爜鐢熸垚淇℃伅 -export function updateGenTable(data) { - return request({ - url: '/tool/gen', - method: 'put', - data: data - }) -} - -// 瀵煎叆琛 -export function importTable(data) { - return request({ - url: '/tool/gen/importTable', - method: 'post', - params: data - }) -} - -// 鍒涘缓琛 -export function createTable(data) { - return request({ - url: '/tool/gen/createTable', - method: 'post', - params: data - }) -} - -// 棰勮鐢熸垚浠g爜 -export function previewTable(tableId) { - return request({ - url: '/tool/gen/preview/' + tableId, - method: 'get' - }) -} - -// 鍒犻櫎琛ㄦ暟鎹 -export function delTable(tableId) { - return request({ - url: '/tool/gen/' + tableId, - method: 'delete' - }) -} - -// 鐢熸垚浠g爜锛堣嚜瀹氫箟璺緞锛 -export function genCode(tableName) { - return request({ - url: '/tool/gen/genCode/' + tableName, - method: 'get' - }) -} - -// 鍚屾鏁版嵁搴 -export function synchDb(tableName) { - return request({ - url: '/tool/gen/synchDb/' + tableName, - method: 'get' - }) -} diff --git a/ruoyi-ui/src/assets/401_images/401.gif b/ruoyi-ui/src/assets/401_images/401.gif deleted file mode 100644 index cd6e0d9..0000000 Binary files a/ruoyi-ui/src/assets/401_images/401.gif and /dev/null differ diff --git a/ruoyi-ui/src/assets/404_images/404.png b/ruoyi-ui/src/assets/404_images/404.png deleted file mode 100644 index 3d8e230..0000000 Binary files a/ruoyi-ui/src/assets/404_images/404.png and /dev/null differ diff --git a/ruoyi-ui/src/assets/404_images/404_cloud.png b/ruoyi-ui/src/assets/404_images/404_cloud.png deleted file mode 100644 index c6281d0..0000000 Binary files a/ruoyi-ui/src/assets/404_images/404_cloud.png and /dev/null differ diff --git a/ruoyi-ui/src/assets/icons/index.js b/ruoyi-ui/src/assets/icons/index.js deleted file mode 100644 index 2c6b309..0000000 --- a/ruoyi-ui/src/assets/icons/index.js +++ /dev/null @@ -1,9 +0,0 @@ -import Vue from 'vue' -import SvgIcon from '@/components/SvgIcon'// svg component - -// register globally -Vue.component('svg-icon', SvgIcon) - -const req = require.context('./svg', false, /\.svg$/) -const requireAll = requireContext => requireContext.keys().map(requireContext) -requireAll(req) diff --git a/ruoyi-ui/src/assets/icons/svg/404.svg b/ruoyi-ui/src/assets/icons/svg/404.svg deleted file mode 100644 index 6df5019..0000000 --- a/ruoyi-ui/src/assets/icons/svg/404.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/bug.svg b/ruoyi-ui/src/assets/icons/svg/bug.svg deleted file mode 100644 index 05a150d..0000000 --- a/ruoyi-ui/src/assets/icons/svg/bug.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/build.svg b/ruoyi-ui/src/assets/icons/svg/build.svg deleted file mode 100644 index 97c4688..0000000 --- a/ruoyi-ui/src/assets/icons/svg/build.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/button.svg b/ruoyi-ui/src/assets/icons/svg/button.svg deleted file mode 100644 index 904fddc..0000000 --- a/ruoyi-ui/src/assets/icons/svg/button.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/cascader.svg b/ruoyi-ui/src/assets/icons/svg/cascader.svg deleted file mode 100644 index e256024..0000000 --- a/ruoyi-ui/src/assets/icons/svg/cascader.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/chart.svg b/ruoyi-ui/src/assets/icons/svg/chart.svg deleted file mode 100644 index 27728fb..0000000 --- a/ruoyi-ui/src/assets/icons/svg/chart.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/checkbox.svg b/ruoyi-ui/src/assets/icons/svg/checkbox.svg deleted file mode 100644 index 013fd3a..0000000 --- a/ruoyi-ui/src/assets/icons/svg/checkbox.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/clipboard.svg b/ruoyi-ui/src/assets/icons/svg/clipboard.svg deleted file mode 100644 index 90923ff..0000000 --- a/ruoyi-ui/src/assets/icons/svg/clipboard.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/code.svg b/ruoyi-ui/src/assets/icons/svg/code.svg deleted file mode 100644 index 5f9c5ab..0000000 --- a/ruoyi-ui/src/assets/icons/svg/code.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/color.svg b/ruoyi-ui/src/assets/icons/svg/color.svg deleted file mode 100644 index 44a81aa..0000000 --- a/ruoyi-ui/src/assets/icons/svg/color.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/component.svg b/ruoyi-ui/src/assets/icons/svg/component.svg deleted file mode 100644 index 29c3458..0000000 --- a/ruoyi-ui/src/assets/icons/svg/component.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/dashboard.svg b/ruoyi-ui/src/assets/icons/svg/dashboard.svg deleted file mode 100644 index 5317d37..0000000 --- a/ruoyi-ui/src/assets/icons/svg/dashboard.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/date-range.svg b/ruoyi-ui/src/assets/icons/svg/date-range.svg deleted file mode 100644 index fda571e..0000000 --- a/ruoyi-ui/src/assets/icons/svg/date-range.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/date.svg b/ruoyi-ui/src/assets/icons/svg/date.svg deleted file mode 100644 index 52dc73e..0000000 --- a/ruoyi-ui/src/assets/icons/svg/date.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/dict.svg b/ruoyi-ui/src/assets/icons/svg/dict.svg deleted file mode 100644 index 4849377..0000000 --- a/ruoyi-ui/src/assets/icons/svg/dict.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/documentation.svg b/ruoyi-ui/src/assets/icons/svg/documentation.svg deleted file mode 100644 index 7043122..0000000 --- a/ruoyi-ui/src/assets/icons/svg/documentation.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/download.svg b/ruoyi-ui/src/assets/icons/svg/download.svg deleted file mode 100644 index c896951..0000000 --- a/ruoyi-ui/src/assets/icons/svg/download.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/drag.svg b/ruoyi-ui/src/assets/icons/svg/drag.svg deleted file mode 100644 index 4185d3c..0000000 --- a/ruoyi-ui/src/assets/icons/svg/drag.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/druid.svg b/ruoyi-ui/src/assets/icons/svg/druid.svg deleted file mode 100644 index a2b4b4e..0000000 --- a/ruoyi-ui/src/assets/icons/svg/druid.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/edit.svg b/ruoyi-ui/src/assets/icons/svg/edit.svg deleted file mode 100644 index d26101f..0000000 --- a/ruoyi-ui/src/assets/icons/svg/edit.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/education.svg b/ruoyi-ui/src/assets/icons/svg/education.svg deleted file mode 100644 index 7bfb01d..0000000 --- a/ruoyi-ui/src/assets/icons/svg/education.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/email.svg b/ruoyi-ui/src/assets/icons/svg/email.svg deleted file mode 100644 index 74d25e2..0000000 --- a/ruoyi-ui/src/assets/icons/svg/email.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/example.svg b/ruoyi-ui/src/assets/icons/svg/example.svg deleted file mode 100644 index 46f42b5..0000000 --- a/ruoyi-ui/src/assets/icons/svg/example.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/excel.svg b/ruoyi-ui/src/assets/icons/svg/excel.svg deleted file mode 100644 index 74d97b8..0000000 --- a/ruoyi-ui/src/assets/icons/svg/excel.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/exit-fullscreen.svg b/ruoyi-ui/src/assets/icons/svg/exit-fullscreen.svg deleted file mode 100644 index 485c128..0000000 --- a/ruoyi-ui/src/assets/icons/svg/exit-fullscreen.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/eye-open.svg b/ruoyi-ui/src/assets/icons/svg/eye-open.svg deleted file mode 100644 index 88dcc98..0000000 --- a/ruoyi-ui/src/assets/icons/svg/eye-open.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/eye.svg b/ruoyi-ui/src/assets/icons/svg/eye.svg deleted file mode 100644 index 16ed2d8..0000000 --- a/ruoyi-ui/src/assets/icons/svg/eye.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/form.svg b/ruoyi-ui/src/assets/icons/svg/form.svg deleted file mode 100644 index dcbaa18..0000000 --- a/ruoyi-ui/src/assets/icons/svg/form.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/fullscreen.svg b/ruoyi-ui/src/assets/icons/svg/fullscreen.svg deleted file mode 100644 index 0e86b6f..0000000 --- a/ruoyi-ui/src/assets/icons/svg/fullscreen.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/github.svg b/ruoyi-ui/src/assets/icons/svg/github.svg deleted file mode 100644 index db0a0d4..0000000 --- a/ruoyi-ui/src/assets/icons/svg/github.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/guide.svg b/ruoyi-ui/src/assets/icons/svg/guide.svg deleted file mode 100644 index b271001..0000000 --- a/ruoyi-ui/src/assets/icons/svg/guide.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/icon.svg b/ruoyi-ui/src/assets/icons/svg/icon.svg deleted file mode 100644 index 82be8ee..0000000 --- a/ruoyi-ui/src/assets/icons/svg/icon.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/input.svg b/ruoyi-ui/src/assets/icons/svg/input.svg deleted file mode 100644 index ab91381..0000000 --- a/ruoyi-ui/src/assets/icons/svg/input.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/international.svg b/ruoyi-ui/src/assets/icons/svg/international.svg deleted file mode 100644 index e9b56ee..0000000 --- a/ruoyi-ui/src/assets/icons/svg/international.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/job.svg b/ruoyi-ui/src/assets/icons/svg/job.svg deleted file mode 100644 index 2a93a25..0000000 --- a/ruoyi-ui/src/assets/icons/svg/job.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/language.svg b/ruoyi-ui/src/assets/icons/svg/language.svg deleted file mode 100644 index 0082b57..0000000 --- a/ruoyi-ui/src/assets/icons/svg/language.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/link.svg b/ruoyi-ui/src/assets/icons/svg/link.svg deleted file mode 100644 index 48197ba..0000000 --- a/ruoyi-ui/src/assets/icons/svg/link.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/list.svg b/ruoyi-ui/src/assets/icons/svg/list.svg deleted file mode 100644 index 20259ed..0000000 --- a/ruoyi-ui/src/assets/icons/svg/list.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/lock.svg b/ruoyi-ui/src/assets/icons/svg/lock.svg deleted file mode 100644 index 74fee54..0000000 --- a/ruoyi-ui/src/assets/icons/svg/lock.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/log.svg b/ruoyi-ui/src/assets/icons/svg/log.svg deleted file mode 100644 index d879d33..0000000 --- a/ruoyi-ui/src/assets/icons/svg/log.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/logininfor.svg b/ruoyi-ui/src/assets/icons/svg/logininfor.svg deleted file mode 100644 index 267f844..0000000 --- a/ruoyi-ui/src/assets/icons/svg/logininfor.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/message.svg b/ruoyi-ui/src/assets/icons/svg/message.svg deleted file mode 100644 index 14ca817..0000000 --- a/ruoyi-ui/src/assets/icons/svg/message.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/money.svg b/ruoyi-ui/src/assets/icons/svg/money.svg deleted file mode 100644 index c1580de..0000000 --- a/ruoyi-ui/src/assets/icons/svg/money.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/monitor.svg b/ruoyi-ui/src/assets/icons/svg/monitor.svg deleted file mode 100644 index bc308cb..0000000 --- a/ruoyi-ui/src/assets/icons/svg/monitor.svg +++ /dev/null @@ -1,2 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/nested.svg b/ruoyi-ui/src/assets/icons/svg/nested.svg deleted file mode 100644 index 06713a8..0000000 --- a/ruoyi-ui/src/assets/icons/svg/nested.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/number.svg b/ruoyi-ui/src/assets/icons/svg/number.svg deleted file mode 100644 index ad5ce9a..0000000 --- a/ruoyi-ui/src/assets/icons/svg/number.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/online.svg b/ruoyi-ui/src/assets/icons/svg/online.svg deleted file mode 100644 index 330a202..0000000 --- a/ruoyi-ui/src/assets/icons/svg/online.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/password.svg b/ruoyi-ui/src/assets/icons/svg/password.svg deleted file mode 100644 index 6c64def..0000000 --- a/ruoyi-ui/src/assets/icons/svg/password.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/pdf.svg b/ruoyi-ui/src/assets/icons/svg/pdf.svg deleted file mode 100644 index 957aa0c..0000000 --- a/ruoyi-ui/src/assets/icons/svg/pdf.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/people.svg b/ruoyi-ui/src/assets/icons/svg/people.svg deleted file mode 100644 index 2bd54ae..0000000 --- a/ruoyi-ui/src/assets/icons/svg/people.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/peoples.svg b/ruoyi-ui/src/assets/icons/svg/peoples.svg deleted file mode 100644 index aab852e..0000000 --- a/ruoyi-ui/src/assets/icons/svg/peoples.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/phone.svg b/ruoyi-ui/src/assets/icons/svg/phone.svg deleted file mode 100644 index ab8e8c4..0000000 --- a/ruoyi-ui/src/assets/icons/svg/phone.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/post.svg b/ruoyi-ui/src/assets/icons/svg/post.svg deleted file mode 100644 index 2922c61..0000000 --- a/ruoyi-ui/src/assets/icons/svg/post.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/qq.svg b/ruoyi-ui/src/assets/icons/svg/qq.svg deleted file mode 100644 index ee13d4e..0000000 --- a/ruoyi-ui/src/assets/icons/svg/qq.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/question.svg b/ruoyi-ui/src/assets/icons/svg/question.svg deleted file mode 100644 index cf75bd4..0000000 --- a/ruoyi-ui/src/assets/icons/svg/question.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/radio.svg b/ruoyi-ui/src/assets/icons/svg/radio.svg deleted file mode 100644 index 0cde345..0000000 --- a/ruoyi-ui/src/assets/icons/svg/radio.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/rate.svg b/ruoyi-ui/src/assets/icons/svg/rate.svg deleted file mode 100644 index aa3b14d..0000000 --- a/ruoyi-ui/src/assets/icons/svg/rate.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/redis-list.svg b/ruoyi-ui/src/assets/icons/svg/redis-list.svg deleted file mode 100644 index 98a15b2..0000000 --- a/ruoyi-ui/src/assets/icons/svg/redis-list.svg +++ /dev/null @@ -1,2 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/redis.svg b/ruoyi-ui/src/assets/icons/svg/redis.svg deleted file mode 100644 index 2f1d62d..0000000 --- a/ruoyi-ui/src/assets/icons/svg/redis.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/row.svg b/ruoyi-ui/src/assets/icons/svg/row.svg deleted file mode 100644 index 0780992..0000000 --- a/ruoyi-ui/src/assets/icons/svg/row.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/search.svg b/ruoyi-ui/src/assets/icons/svg/search.svg deleted file mode 100644 index 84233dd..0000000 --- a/ruoyi-ui/src/assets/icons/svg/search.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/select.svg b/ruoyi-ui/src/assets/icons/svg/select.svg deleted file mode 100644 index d628382..0000000 --- a/ruoyi-ui/src/assets/icons/svg/select.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/server.svg b/ruoyi-ui/src/assets/icons/svg/server.svg deleted file mode 100644 index eb287e3..0000000 --- a/ruoyi-ui/src/assets/icons/svg/server.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/shopping.svg b/ruoyi-ui/src/assets/icons/svg/shopping.svg deleted file mode 100644 index 87513e7..0000000 --- a/ruoyi-ui/src/assets/icons/svg/shopping.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/size.svg b/ruoyi-ui/src/assets/icons/svg/size.svg deleted file mode 100644 index ddb25b8..0000000 --- a/ruoyi-ui/src/assets/icons/svg/size.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/skill.svg b/ruoyi-ui/src/assets/icons/svg/skill.svg deleted file mode 100644 index a3b7312..0000000 --- a/ruoyi-ui/src/assets/icons/svg/skill.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/slider.svg b/ruoyi-ui/src/assets/icons/svg/slider.svg deleted file mode 100644 index fbe4f39..0000000 --- a/ruoyi-ui/src/assets/icons/svg/slider.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/star.svg b/ruoyi-ui/src/assets/icons/svg/star.svg deleted file mode 100644 index 6cf86e6..0000000 --- a/ruoyi-ui/src/assets/icons/svg/star.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/swagger.svg b/ruoyi-ui/src/assets/icons/svg/swagger.svg deleted file mode 100644 index 05d4e7b..0000000 --- a/ruoyi-ui/src/assets/icons/svg/swagger.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/switch.svg b/ruoyi-ui/src/assets/icons/svg/switch.svg deleted file mode 100644 index 0ba61e3..0000000 --- a/ruoyi-ui/src/assets/icons/svg/switch.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/system.svg b/ruoyi-ui/src/assets/icons/svg/system.svg deleted file mode 100644 index 5992593..0000000 --- a/ruoyi-ui/src/assets/icons/svg/system.svg +++ /dev/null @@ -1,2 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/tab.svg b/ruoyi-ui/src/assets/icons/svg/tab.svg deleted file mode 100644 index b4b48e4..0000000 --- a/ruoyi-ui/src/assets/icons/svg/tab.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/table.svg b/ruoyi-ui/src/assets/icons/svg/table.svg deleted file mode 100644 index 0e3dc9d..0000000 --- a/ruoyi-ui/src/assets/icons/svg/table.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/textarea.svg b/ruoyi-ui/src/assets/icons/svg/textarea.svg deleted file mode 100644 index 2709f29..0000000 --- a/ruoyi-ui/src/assets/icons/svg/textarea.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/theme.svg b/ruoyi-ui/src/assets/icons/svg/theme.svg deleted file mode 100644 index 5982a2f..0000000 --- a/ruoyi-ui/src/assets/icons/svg/theme.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/time-range.svg b/ruoyi-ui/src/assets/icons/svg/time-range.svg deleted file mode 100644 index 13c1202..0000000 --- a/ruoyi-ui/src/assets/icons/svg/time-range.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/time.svg b/ruoyi-ui/src/assets/icons/svg/time.svg deleted file mode 100644 index b376e32..0000000 --- a/ruoyi-ui/src/assets/icons/svg/time.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/tool.svg b/ruoyi-ui/src/assets/icons/svg/tool.svg deleted file mode 100644 index 48e0e35..0000000 --- a/ruoyi-ui/src/assets/icons/svg/tool.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/tree-table.svg b/ruoyi-ui/src/assets/icons/svg/tree-table.svg deleted file mode 100644 index 8aafdb8..0000000 --- a/ruoyi-ui/src/assets/icons/svg/tree-table.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/tree.svg b/ruoyi-ui/src/assets/icons/svg/tree.svg deleted file mode 100644 index dd4b7dd..0000000 --- a/ruoyi-ui/src/assets/icons/svg/tree.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/upload.svg b/ruoyi-ui/src/assets/icons/svg/upload.svg deleted file mode 100644 index bae49c0..0000000 --- a/ruoyi-ui/src/assets/icons/svg/upload.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/user.svg b/ruoyi-ui/src/assets/icons/svg/user.svg deleted file mode 100644 index 0ba0716..0000000 --- a/ruoyi-ui/src/assets/icons/svg/user.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/validCode.svg b/ruoyi-ui/src/assets/icons/svg/validCode.svg deleted file mode 100644 index cfb1021..0000000 --- a/ruoyi-ui/src/assets/icons/svg/validCode.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/wechat.svg b/ruoyi-ui/src/assets/icons/svg/wechat.svg deleted file mode 100644 index c586e55..0000000 --- a/ruoyi-ui/src/assets/icons/svg/wechat.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/zip.svg b/ruoyi-ui/src/assets/icons/svg/zip.svg deleted file mode 100644 index f806fc4..0000000 --- a/ruoyi-ui/src/assets/icons/svg/zip.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svgo.yml b/ruoyi-ui/src/assets/icons/svgo.yml deleted file mode 100644 index d11906a..0000000 --- a/ruoyi-ui/src/assets/icons/svgo.yml +++ /dev/null @@ -1,22 +0,0 @@ -# replace default config - -# multipass: true -# full: true - -plugins: - - # - name - # - # or: - # - name: false - # - name: true - # - # or: - # - name: - # param1: 1 - # param2: 2 - -- removeAttrs: - attrs: - - 'fill' - - 'fill-rule' diff --git a/ruoyi-ui/src/assets/images/dark.svg b/ruoyi-ui/src/assets/images/dark.svg deleted file mode 100644 index f646bd7..0000000 --- a/ruoyi-ui/src/assets/images/dark.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/images/light.svg b/ruoyi-ui/src/assets/images/light.svg deleted file mode 100644 index ab7cc08..0000000 --- a/ruoyi-ui/src/assets/images/light.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-ui/src/assets/images/login-background.jpg b/ruoyi-ui/src/assets/images/login-background.jpg deleted file mode 100644 index 8a89eb8..0000000 Binary files a/ruoyi-ui/src/assets/images/login-background.jpg and /dev/null differ diff --git a/ruoyi-ui/src/assets/images/pay.png b/ruoyi-ui/src/assets/images/pay.png deleted file mode 100644 index bb8b967..0000000 Binary files a/ruoyi-ui/src/assets/images/pay.png and /dev/null differ diff --git a/ruoyi-ui/src/assets/images/profile.jpg b/ruoyi-ui/src/assets/images/profile.jpg deleted file mode 100644 index b3a940b..0000000 Binary files a/ruoyi-ui/src/assets/images/profile.jpg and /dev/null differ diff --git a/ruoyi-ui/src/assets/logo/logo.png b/ruoyi-ui/src/assets/logo/logo.png deleted file mode 100644 index e263760..0000000 Binary files a/ruoyi-ui/src/assets/logo/logo.png and /dev/null differ diff --git a/ruoyi-ui/src/assets/styles/btn.scss b/ruoyi-ui/src/assets/styles/btn.scss deleted file mode 100644 index e6ba1a8..0000000 --- a/ruoyi-ui/src/assets/styles/btn.scss +++ /dev/null @@ -1,99 +0,0 @@ -@import './variables.scss'; - -@mixin colorBtn($color) { - background: $color; - - &:hover { - color: $color; - - &:before, - &:after { - background: $color; - } - } -} - -.blue-btn { - @include colorBtn($blue) -} - -.light-blue-btn { - @include colorBtn($light-blue) -} - -.red-btn { - @include colorBtn($red) -} - -.pink-btn { - @include colorBtn($pink) -} - -.green-btn { - @include colorBtn($green) -} - -.tiffany-btn { - @include colorBtn($tiffany) -} - -.yellow-btn { - @include colorBtn($yellow) -} - -.pan-btn { - font-size: 14px; - color: #fff; - padding: 14px 36px; - border-radius: 8px; - border: none; - outline: none; - transition: 600ms ease all; - position: relative; - display: inline-block; - - &:hover { - background: #fff; - - &:before, - &:after { - width: 100%; - transition: 600ms ease all; - } - } - - &:before, - &:after { - content: ''; - position: absolute; - top: 0; - right: 0; - height: 2px; - width: 0; - transition: 400ms ease all; - } - - &::after { - right: inherit; - top: inherit; - left: 0; - bottom: 0; - } -} - -.custom-button { - display: inline-block; - line-height: 1; - white-space: nowrap; - cursor: pointer; - background: #fff; - color: #fff; - -webkit-appearance: none; - text-align: center; - box-sizing: border-box; - outline: 0; - margin: 0; - padding: 10px 15px; - font-size: 14px; - border-radius: 4px; -} diff --git a/ruoyi-ui/src/assets/styles/element-ui.scss b/ruoyi-ui/src/assets/styles/element-ui.scss deleted file mode 100644 index 363092a..0000000 --- a/ruoyi-ui/src/assets/styles/element-ui.scss +++ /dev/null @@ -1,92 +0,0 @@ -// cover some element-ui styles - -.el-breadcrumb__inner, -.el-breadcrumb__inner a { - font-weight: 400 !important; -} - -.el-upload { - input[type="file"] { - display: none !important; - } -} - -.el-upload__input { - display: none; -} - -.cell { - .el-tag { - margin-right: 0px; - } -} - -.small-padding { - .cell { - padding-left: 5px; - padding-right: 5px; - } -} - -.fixed-width { - .el-button--mini { - padding: 7px 10px; - width: 60px; - } -} - -.status-col { - .cell { - padding: 0 10px; - text-align: center; - - .el-tag { - margin-right: 0px; - } - } -} - -// to fixed https://github.com/ElemeFE/element/issues/2461 -.el-dialog { - transform: none; - left: 0; - position: relative; - margin: 0 auto; -} - -// refine element ui upload -.upload-container { - .el-upload { - width: 100%; - - .el-upload-dragger { - width: 100%; - height: 200px; - } - } -} - -// dropdown -.el-dropdown-menu { - a { - display: block - } -} - -// fix date-picker ui bug in filter-item -.el-range-editor.el-input__inner { - display: inline-flex !important; -} - -// to fix el-date-picker css style -.el-range-separator { - box-sizing: content-box; -} - -.el-menu--collapse - > div - > .el-submenu - > .el-submenu__title - .el-submenu__icon-arrow { - display: none; -} \ No newline at end of file diff --git a/ruoyi-ui/src/assets/styles/element-variables.scss b/ruoyi-ui/src/assets/styles/element-variables.scss deleted file mode 100644 index 1615ff2..0000000 --- a/ruoyi-ui/src/assets/styles/element-variables.scss +++ /dev/null @@ -1,31 +0,0 @@ -/** -* I think element-ui's default theme color is too light for long-term use. -* So I modified the default color and you can modify it to your liking. -**/ - -/* theme color */ -$--color-primary: #1890ff; -$--color-success: #13ce66; -$--color-warning: #ffba00; -$--color-danger: #ff4949; -// $--color-info: #1E1E1E; - -$--button-font-weight: 400; - -// $--color-text-regular: #1f2d3d; - -$--border-color-light: #dfe4ed; -$--border-color-lighter: #e6ebf5; - -$--table-border: 1px solid #dfe6ec; - -/* icon font path, required */ -$--font-path: '~element-ui/lib/theme-chalk/fonts'; - -@import "~element-ui/packages/theme-chalk/src/index"; - -// the :export directive is the magic sauce for webpack -// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass -:export { - theme: $--color-primary; -} diff --git a/ruoyi-ui/src/assets/styles/index.scss b/ruoyi-ui/src/assets/styles/index.scss deleted file mode 100644 index 2f3b9ef..0000000 --- a/ruoyi-ui/src/assets/styles/index.scss +++ /dev/null @@ -1,182 +0,0 @@ -@import './variables.scss'; -@import './mixin.scss'; -@import './transition.scss'; -@import './element-ui.scss'; -@import './sidebar.scss'; -@import './btn.scss'; - -body { - height: 100%; - -moz-osx-font-smoothing: grayscale; - -webkit-font-smoothing: antialiased; - text-rendering: optimizeLegibility; - font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; -} - -label { - font-weight: 700; -} - -html { - height: 100%; - box-sizing: border-box; -} - -#app { - height: 100%; -} - -*, -*:before, -*:after { - box-sizing: inherit; -} - -.no-padding { - padding: 0px !important; -} - -.padding-content { - padding: 4px 0; -} - -a:focus, -a:active { - outline: none; -} - -a, -a:focus, -a:hover { - cursor: pointer; - color: inherit; - text-decoration: none; -} - -div:focus { - outline: none; -} - -.fr { - float: right; -} - -.fl { - float: left; -} - -.pr-5 { - padding-right: 5px; -} - -.pl-5 { - padding-left: 5px; -} - -.block { - display: block; -} - -.pointer { - cursor: pointer; -} - -.inlineBlock { - display: block; -} - -.clearfix { - &:after { - visibility: hidden; - display: block; - font-size: 0; - content: " "; - clear: both; - height: 0; - } -} - -aside { - background: #eef1f6; - padding: 8px 24px; - margin-bottom: 20px; - border-radius: 2px; - display: block; - line-height: 32px; - font-size: 16px; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; - color: #2c3e50; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - - a { - color: #337ab7; - cursor: pointer; - - &:hover { - color: rgb(32, 160, 255); - } - } -} - -//main-container鍏ㄥ眬鏍峰紡 -.app-container { - padding: 20px; -} - -.components-container { - margin: 30px 50px; - position: relative; -} - -.pagination-container { - margin-top: 30px; -} - -.text-center { - text-align: center -} - -.sub-navbar { - height: 50px; - line-height: 50px; - position: relative; - width: 100%; - text-align: right; - padding-right: 20px; - transition: 600ms ease position; - background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%); - - .subtitle { - font-size: 20px; - color: #fff; - } - - &.draft { - background: #d0d0d0; - } - - &.deleted { - background: #d0d0d0; - } -} - -.link-type, -.link-type:focus { - color: #337ab7; - cursor: pointer; - - &:hover { - color: rgb(32, 160, 255); - } -} - -.filter-container { - padding-bottom: 10px; - - .filter-item { - display: inline-block; - vertical-align: middle; - margin-bottom: 10px; - } -} diff --git a/ruoyi-ui/src/assets/styles/mixin.scss b/ruoyi-ui/src/assets/styles/mixin.scss deleted file mode 100644 index 06fa061..0000000 --- a/ruoyi-ui/src/assets/styles/mixin.scss +++ /dev/null @@ -1,66 +0,0 @@ -@mixin clearfix { - &:after { - content: ""; - display: table; - clear: both; - } -} - -@mixin scrollBar { - &::-webkit-scrollbar-track-piece { - background: #d3dce6; - } - - &::-webkit-scrollbar { - width: 6px; - } - - &::-webkit-scrollbar-thumb { - background: #99a9bf; - border-radius: 20px; - } -} - -@mixin relative { - position: relative; - width: 100%; - height: 100%; -} - -@mixin pct($pct) { - width: #{$pct}; - position: relative; - margin: 0 auto; -} - -@mixin triangle($width, $height, $color, $direction) { - $width: $width/2; - $color-border-style: $height solid $color; - $transparent-border-style: $width solid transparent; - height: 0; - width: 0; - - @if $direction==up { - border-bottom: $color-border-style; - border-left: $transparent-border-style; - border-right: $transparent-border-style; - } - - @else if $direction==right { - border-left: $color-border-style; - border-top: $transparent-border-style; - border-bottom: $transparent-border-style; - } - - @else if $direction==down { - border-top: $color-border-style; - border-left: $transparent-border-style; - border-right: $transparent-border-style; - } - - @else if $direction==left { - border-right: $color-border-style; - border-top: $transparent-border-style; - border-bottom: $transparent-border-style; - } -} diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss deleted file mode 100644 index 4e29874..0000000 --- a/ruoyi-ui/src/assets/styles/ruoyi.scss +++ /dev/null @@ -1,291 +0,0 @@ -/** -* 閫氱敤css鏍峰紡甯冨眬澶勭悊 -* Copyright (c) 2019 ruoyi -*/ - -/** 鍩虹閫氱敤 **/ -.pt5 { - padding-top: 5px; -} - -.pr5 { - padding-right: 5px; -} - -.pb5 { - padding-bottom: 5px; -} - -.mt5 { - margin-top: 5px; -} - -.mr5 { - margin-right: 5px; -} - -.mb5 { - margin-bottom: 5px; -} - -.mb8 { - margin-bottom: 8px; -} - -.ml5 { - margin-left: 5px; -} - -.mt10 { - margin-top: 10px; -} - -.mr10 { - margin-right: 10px; -} - -.mb10 { - margin-bottom: 10px; -} -.ml10 { - margin-left: 10px; -} - -.mt20 { - margin-top: 20px; -} - -.mr20 { - margin-right: 20px; -} - -.mb20 { - margin-bottom: 20px; -} -.ml20 { - margin-left: 20px; -} - -.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 { - font-family: inherit; - font-weight: 500; - line-height: 1.1; - color: inherit; -} - -.el-message-box__status + .el-message-box__message{ - word-break: break-word; -} - -.el-dialog:not(.is-fullscreen) { - margin-top: 6vh !important; -} - -.el-dialog__wrapper.scrollbar .el-dialog .el-dialog__body { - overflow: auto; - overflow-x: hidden; - max-height: 70vh; - padding: 10px 20px 0; -} - -.el-table { - .el-table__header-wrapper, .el-table__fixed-header-wrapper { - th { - word-break: break-word; - background-color: #f8f8f9; - color: #515a6e; - height: 40px; - font-size: 13px; - } - } - - .el-table__body-wrapper { - .el-button [class*="el-icon-"] + span { - margin-left: 1px; - } - } -} - -/** 琛ㄥ崟甯冨眬 **/ -.form-header { - font-size: 15px; - color: #6379bb; - border-bottom: 1px solid #ddd; - margin: 8px 10px 25px 10px; - padding-bottom: 5px -} - -/** 琛ㄦ牸甯冨眬 **/ -.pagination-container { - position: relative; - height: 25px; - margin-bottom: 10px; - margin-top: 15px; - padding: 10px 20px !important; -} - -/* tree border */ -.tree-border { - margin-top: 5px; - border: 1px solid #e5e6e7; - background: #FFFFFF none; - border-radius: 4px; -} - -.pagination-container .el-pagination { - right: 0; - position: absolute; -} - -@media (max-width: 768px) { - .pagination-container .el-pagination > .el-pagination__jump { - display: none !important; - } - .pagination-container .el-pagination > .el-pagination__sizes { - display: none !important; - } -} - -.el-table .fixed-width .el-button--mini { - padding-left: 0; - padding-right: 0; - width: inherit; -} - -/** 琛ㄦ牸鏇村鎿嶄綔涓嬫媺鏍峰紡 */ -.el-table .el-dropdown-link,.el-table .el-dropdown-selfdefine { - cursor: pointer; - margin-left: 5px; -} - -.el-table .el-dropdown, .el-icon-arrow-down { - font-size: 12px; -} - -.el-tree-node__content > .el-checkbox { - margin-right: 8px; -} - -.list-group-striped > .list-group-item { - border-left: 0; - border-right: 0; - border-radius: 0; - padding-left: 0; - padding-right: 0; -} - -.list-group { - padding-left: 0px; - list-style: none; -} - -.list-group-item { - border-bottom: 1px solid #e7eaec; - border-top: 1px solid #e7eaec; - margin-bottom: -1px; - padding: 11px 0px; - font-size: 13px; -} - -.pull-right { - float: right !important; -} - -.el-card__header { - padding: 14px 15px 7px; - min-height: 40px; -} - -.el-card__body { - padding: 15px 20px 20px 20px; -} - -.card-box { - padding-right: 15px; - padding-left: 15px; - margin-bottom: 10px; -} - -/* button color */ -.el-button--cyan.is-active, -.el-button--cyan:active { - background: #20B2AA; - border-color: #20B2AA; - color: #FFFFFF; -} - -.el-button--cyan:focus, -.el-button--cyan:hover { - background: #48D1CC; - border-color: #48D1CC; - color: #FFFFFF; -} - -.el-button--cyan { - background-color: #20B2AA; - border-color: #20B2AA; - color: #FFFFFF; -} - -/* text color */ -.text-navy { - color: #1ab394; -} - -.text-primary { - color: inherit; -} - -.text-success { - color: #1c84c6; -} - -.text-info { - color: #23c6c8; -} - -.text-warning { - color: #f8ac59; -} - -.text-danger { - color: #ed5565; -} - -.text-muted { - color: #888888; -} - -/* image */ -.img-circle { - border-radius: 50%; -} - -.img-lg { - width: 120px; - height: 120px; -} - -.avatar-upload-preview { - position: relative; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - width: 200px; - height: 200px; - border-radius: 50%; - box-shadow: 0 0 4px #ccc; - overflow: hidden; -} - -/* 鎷栨嫿鍒楁牱寮 */ -.sortable-ghost { - opacity: .8; - color: #fff !important; - background: #42b983 !important; -} - -.top-right-btn { - position: relative; - float: right; -} diff --git a/ruoyi-ui/src/assets/styles/sidebar.scss b/ruoyi-ui/src/assets/styles/sidebar.scss deleted file mode 100644 index abe5b63..0000000 --- a/ruoyi-ui/src/assets/styles/sidebar.scss +++ /dev/null @@ -1,227 +0,0 @@ -#app { - - .main-container { - height: 100%; - transition: margin-left .28s; - margin-left: $base-sidebar-width; - position: relative; - } - - .sidebarHide { - margin-left: 0!important; - } - - .sidebar-container { - -webkit-transition: width .28s; - transition: width 0.28s; - width: $base-sidebar-width !important; - background-color: $base-menu-background; - height: 100%; - position: fixed; - font-size: 0px; - top: 0; - bottom: 0; - left: 0; - z-index: 1001; - overflow: hidden; - -webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35); - box-shadow: 2px 0 6px rgba(0,21,41,.35); - - // reset element-ui css - .horizontal-collapse-transition { - transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out; - } - - .scrollbar-wrapper { - overflow-x: hidden !important; - } - - .el-scrollbar__bar.is-vertical { - right: 0px; - } - - .el-scrollbar { - height: 100%; - } - - &.has-logo { - .el-scrollbar { - height: calc(100% - 50px); - } - } - - .is-horizontal { - display: none; - } - - a { - display: inline-block; - width: 100%; - overflow: hidden; - } - - .svg-icon { - margin-right: 16px; - } - - .el-menu { - border: none; - height: 100%; - width: 100% !important; - } - - .el-menu-item, .el-submenu__title { - overflow: hidden !important; - text-overflow: ellipsis !important; - white-space: nowrap !important; - } - - // menu hover - .submenu-title-noDropdown, - .el-submenu__title { - &:hover { - background-color: rgba(0, 0, 0, 0.06) !important; - } - } - - & .theme-dark .is-active > .el-submenu__title { - color: $base-menu-color-active !important; - } - - & .nest-menu .el-submenu>.el-submenu__title, - & .el-submenu .el-menu-item { - min-width: $base-sidebar-width !important; - - &:hover { - background-color: rgba(0, 0, 0, 0.06) !important; - } - } - - & .theme-dark .nest-menu .el-submenu>.el-submenu__title, - & .theme-dark .el-submenu .el-menu-item { - background-color: $base-sub-menu-background !important; - - &:hover { - background-color: $base-sub-menu-hover !important; - } - } - } - - .hideSidebar { - .sidebar-container { - width: 54px !important; - } - - .main-container { - margin-left: 54px; - } - - .submenu-title-noDropdown { - padding: 0 !important; - position: relative; - - .el-tooltip { - padding: 0 !important; - - .svg-icon { - margin-left: 20px; - } - } - } - - .el-submenu { - overflow: hidden; - - &>.el-submenu__title { - padding: 0 !important; - - .svg-icon { - margin-left: 20px; - } - - } - } - - .el-menu--collapse { - .el-submenu { - &>.el-submenu__title { - &>span { - height: 0; - width: 0; - overflow: hidden; - visibility: hidden; - display: inline-block; - } - } - } - } - } - - .el-menu--collapse .el-menu .el-submenu { - min-width: $base-sidebar-width !important; - } - - // mobile responsive - .mobile { - .main-container { - margin-left: 0px; - } - - .sidebar-container { - transition: transform .28s; - width: $base-sidebar-width !important; - } - - &.hideSidebar { - .sidebar-container { - pointer-events: none; - transition-duration: 0.3s; - transform: translate3d(-$base-sidebar-width, 0, 0); - } - } - } - - .withoutAnimation { - - .main-container, - .sidebar-container { - transition: none; - } - } -} - -// when menu collapsed -.el-menu--vertical { - &>.el-menu { - .svg-icon { - margin-right: 16px; - } - } - - .nest-menu .el-submenu>.el-submenu__title, - .el-menu-item { - &:hover { - // you can use $subMenuHover - background-color: rgba(0, 0, 0, 0.06) !important; - } - } - - // the scroll bar appears when the subMenu is too long - >.el-menu--popup { - max-height: 100vh; - overflow-y: auto; - - &::-webkit-scrollbar-track-piece { - background: #d3dce6; - } - - &::-webkit-scrollbar { - width: 6px; - } - - &::-webkit-scrollbar-thumb { - background: #99a9bf; - border-radius: 20px; - } - } -} diff --git a/ruoyi-ui/src/assets/styles/transition.scss b/ruoyi-ui/src/assets/styles/transition.scss deleted file mode 100644 index 073f8c6..0000000 --- a/ruoyi-ui/src/assets/styles/transition.scss +++ /dev/null @@ -1,49 +0,0 @@ -// global transition css - -/* fade */ -.fade-enter-active, -.fade-leave-active { - transition: opacity 0.28s; -} - -.fade-enter, -.fade-leave-active { - opacity: 0; -} - -/* fade-transform */ -.fade-transform--move, -.fade-transform-leave-active, -.fade-transform-enter-active { - transition: all .5s; -} - -.fade-transform-enter { - opacity: 0; - transform: translateX(-30px); -} - -.fade-transform-leave-to { - opacity: 0; - transform: translateX(30px); -} - -/* breadcrumb transition */ -.breadcrumb-enter-active, -.breadcrumb-leave-active { - transition: all .5s; -} - -.breadcrumb-enter, -.breadcrumb-leave-active { - opacity: 0; - transform: translateX(20px); -} - -.breadcrumb-move { - transition: all .5s; -} - -.breadcrumb-leave-active { - position: absolute; -} diff --git a/ruoyi-ui/src/assets/styles/variables.scss b/ruoyi-ui/src/assets/styles/variables.scss deleted file mode 100644 index 34484d4..0000000 --- a/ruoyi-ui/src/assets/styles/variables.scss +++ /dev/null @@ -1,54 +0,0 @@ -// base color -$blue:#324157; -$light-blue:#3A71A8; -$red:#C03639; -$pink: #E65D6E; -$green: #30B08F; -$tiffany: #4AB7BD; -$yellow:#FEC171; -$panGreen: #30B08F; - -// 榛樿鑿滃崟涓婚椋庢牸 -$base-menu-color:#bfcbd9; -$base-menu-color-active:#f4f4f5; -$base-menu-background:#304156; -$base-logo-title-color: #ffffff; - -$base-menu-light-color:rgba(0,0,0,.70); -$base-menu-light-background:#ffffff; -$base-logo-light-title-color: #001529; - -$base-sub-menu-background:#1f2d3d; -$base-sub-menu-hover:#001528; - -// 鑷畾涔夋殫鑹茶彍鍗曢鏍 -/** -$base-menu-color:hsla(0,0%,100%,.65); -$base-menu-color-active:#fff; -$base-menu-background:#001529; -$base-logo-title-color: #ffffff; - -$base-menu-light-color:rgba(0,0,0,.70); -$base-menu-light-background:#ffffff; -$base-logo-light-title-color: #001529; - -$base-sub-menu-background:#000c17; -$base-sub-menu-hover:#001528; -*/ - -$base-sidebar-width: 200px; - -// the :export directive is the magic sauce for webpack -// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass -:export { - menuColor: $base-menu-color; - menuLightColor: $base-menu-light-color; - menuColorActive: $base-menu-color-active; - menuBackground: $base-menu-background; - menuLightBackground: $base-menu-light-background; - subMenuBackground: $base-sub-menu-background; - subMenuHover: $base-sub-menu-hover; - sideBarWidth: $base-sidebar-width; - logoTitleColor: $base-logo-title-color; - logoLightTitleColor: $base-logo-light-title-color -} diff --git a/ruoyi-ui/src/components/Breadcrumb/index.vue b/ruoyi-ui/src/components/Breadcrumb/index.vue deleted file mode 100644 index 1696f54..0000000 --- a/ruoyi-ui/src/components/Breadcrumb/index.vue +++ /dev/null @@ -1,74 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/components/Crontab/day.vue b/ruoyi-ui/src/components/Crontab/day.vue deleted file mode 100644 index fe3eaf0..0000000 --- a/ruoyi-ui/src/components/Crontab/day.vue +++ /dev/null @@ -1,161 +0,0 @@ - - - diff --git a/ruoyi-ui/src/components/Crontab/hour.vue b/ruoyi-ui/src/components/Crontab/hour.vue deleted file mode 100644 index 4b1f1fc..0000000 --- a/ruoyi-ui/src/components/Crontab/hour.vue +++ /dev/null @@ -1,114 +0,0 @@ - - - diff --git a/ruoyi-ui/src/components/Crontab/index.vue b/ruoyi-ui/src/components/Crontab/index.vue deleted file mode 100644 index 3963df2..0000000 --- a/ruoyi-ui/src/components/Crontab/index.vue +++ /dev/null @@ -1,430 +0,0 @@ - - - - diff --git a/ruoyi-ui/src/components/Crontab/min.vue b/ruoyi-ui/src/components/Crontab/min.vue deleted file mode 100644 index 43cab90..0000000 --- a/ruoyi-ui/src/components/Crontab/min.vue +++ /dev/null @@ -1,116 +0,0 @@ - - - \ No newline at end of file diff --git a/ruoyi-ui/src/components/Crontab/month.vue b/ruoyi-ui/src/components/Crontab/month.vue deleted file mode 100644 index fd0ac38..0000000 --- a/ruoyi-ui/src/components/Crontab/month.vue +++ /dev/null @@ -1,114 +0,0 @@ - - - diff --git a/ruoyi-ui/src/components/Crontab/result.vue b/ruoyi-ui/src/components/Crontab/result.vue deleted file mode 100644 index aea6e0e..0000000 --- a/ruoyi-ui/src/components/Crontab/result.vue +++ /dev/null @@ -1,559 +0,0 @@ - - - diff --git a/ruoyi-ui/src/components/Crontab/second.vue b/ruoyi-ui/src/components/Crontab/second.vue deleted file mode 100644 index e7b7761..0000000 --- a/ruoyi-ui/src/components/Crontab/second.vue +++ /dev/null @@ -1,117 +0,0 @@ - - - diff --git a/ruoyi-ui/src/components/Crontab/week.vue b/ruoyi-ui/src/components/Crontab/week.vue deleted file mode 100644 index 1cec700..0000000 --- a/ruoyi-ui/src/components/Crontab/week.vue +++ /dev/null @@ -1,202 +0,0 @@ - - - diff --git a/ruoyi-ui/src/components/Crontab/year.vue b/ruoyi-ui/src/components/Crontab/year.vue deleted file mode 100644 index 5487a6c..0000000 --- a/ruoyi-ui/src/components/Crontab/year.vue +++ /dev/null @@ -1,131 +0,0 @@ - - - diff --git a/ruoyi-ui/src/components/DictData/index.js b/ruoyi-ui/src/components/DictData/index.js deleted file mode 100644 index 7b85d4a..0000000 --- a/ruoyi-ui/src/components/DictData/index.js +++ /dev/null @@ -1,49 +0,0 @@ -import Vue from 'vue' -import store from '@/store' -import DataDict from '@/utils/dict' -import { getDicts as getDicts } from '@/api/system/dict/data' - -function searchDictByKey(dict, key) { - if (key == null && key == "") { - return null - } - try { - for (let i = 0; i < dict.length; i++) { - if (dict[i].key == key) { - return dict[i].value - } - } - } catch (e) { - return null - } -} - -function install() { - Vue.use(DataDict, { - metas: { - '*': { - labelField: 'dictLabel', - valueField: 'dictValue', - request(dictMeta) { - const storeDict = searchDictByKey(store.getters.dict, dictMeta.type) - if (storeDict) { - return new Promise(resolve => { resolve(storeDict) }) - } else { - return new Promise((resolve, reject) => { - getDicts(dictMeta.type).then(res => { - store.dispatch('dict/setDict', { key: dictMeta.type, value: res.data }) - resolve(res.data) - }).catch(error => { - reject(error) - }) - }) - } - }, - }, - }, - }) -} - -export default { - install, -} \ No newline at end of file diff --git a/ruoyi-ui/src/components/DictTag/index.vue b/ruoyi-ui/src/components/DictTag/index.vue deleted file mode 100644 index 6b5b230..0000000 --- a/ruoyi-ui/src/components/DictTag/index.vue +++ /dev/null @@ -1,89 +0,0 @@ - - - - diff --git a/ruoyi-ui/src/components/Editor/index.vue b/ruoyi-ui/src/components/Editor/index.vue deleted file mode 100644 index 8981d76..0000000 --- a/ruoyi-ui/src/components/Editor/index.vue +++ /dev/null @@ -1,274 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/components/FileUpload/index.vue b/ruoyi-ui/src/components/FileUpload/index.vue deleted file mode 100644 index c7f6b0a..0000000 --- a/ruoyi-ui/src/components/FileUpload/index.vue +++ /dev/null @@ -1,216 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/components/Hamburger/index.vue b/ruoyi-ui/src/components/Hamburger/index.vue deleted file mode 100644 index 368b002..0000000 --- a/ruoyi-ui/src/components/Hamburger/index.vue +++ /dev/null @@ -1,44 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/components/HeaderSearch/index.vue b/ruoyi-ui/src/components/HeaderSearch/index.vue deleted file mode 100644 index 7d6780b..0000000 --- a/ruoyi-ui/src/components/HeaderSearch/index.vue +++ /dev/null @@ -1,198 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/components/IconSelect/index.vue b/ruoyi-ui/src/components/IconSelect/index.vue deleted file mode 100644 index 8dadc02..0000000 --- a/ruoyi-ui/src/components/IconSelect/index.vue +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - diff --git a/ruoyi-ui/src/components/IconSelect/requireIcons.js b/ruoyi-ui/src/components/IconSelect/requireIcons.js deleted file mode 100644 index 99e5c54..0000000 --- a/ruoyi-ui/src/components/IconSelect/requireIcons.js +++ /dev/null @@ -1,11 +0,0 @@ - -const req = require.context('../../assets/icons/svg', false, /\.svg$/) -const requireAll = requireContext => requireContext.keys() - -const re = /\.\/(.*)\.svg/ - -const icons = requireAll(req).map(i => { - return i.match(re)[1] -}) - -export default icons diff --git a/ruoyi-ui/src/components/ImagePreview/index.vue b/ruoyi-ui/src/components/ImagePreview/index.vue deleted file mode 100644 index 3c770c7..0000000 --- a/ruoyi-ui/src/components/ImagePreview/index.vue +++ /dev/null @@ -1,90 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/components/ImageUpload/index.vue b/ruoyi-ui/src/components/ImageUpload/index.vue deleted file mode 100644 index 2e64c9b..0000000 --- a/ruoyi-ui/src/components/ImageUpload/index.vue +++ /dev/null @@ -1,226 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/components/Pagination/index.vue b/ruoyi-ui/src/components/Pagination/index.vue deleted file mode 100644 index 56f5a6b..0000000 --- a/ruoyi-ui/src/components/Pagination/index.vue +++ /dev/null @@ -1,114 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/components/PanThumb/index.vue b/ruoyi-ui/src/components/PanThumb/index.vue deleted file mode 100644 index 1bcf417..0000000 --- a/ruoyi-ui/src/components/PanThumb/index.vue +++ /dev/null @@ -1,142 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/components/ParentView/index.vue b/ruoyi-ui/src/components/ParentView/index.vue deleted file mode 100644 index 7bf6148..0000000 --- a/ruoyi-ui/src/components/ParentView/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/ruoyi-ui/src/components/RightPanel/index.vue b/ruoyi-ui/src/components/RightPanel/index.vue deleted file mode 100644 index 5abeecb..0000000 --- a/ruoyi-ui/src/components/RightPanel/index.vue +++ /dev/null @@ -1,106 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/components/RightToolbar/index.vue b/ruoyi-ui/src/components/RightToolbar/index.vue deleted file mode 100644 index 67da293..0000000 --- a/ruoyi-ui/src/components/RightToolbar/index.vue +++ /dev/null @@ -1,129 +0,0 @@ - - - diff --git a/ruoyi-ui/src/components/RuoYi/Doc/index.vue b/ruoyi-ui/src/components/RuoYi/Doc/index.vue deleted file mode 100644 index 75fa864..0000000 --- a/ruoyi-ui/src/components/RuoYi/Doc/index.vue +++ /dev/null @@ -1,21 +0,0 @@ - - - \ No newline at end of file diff --git a/ruoyi-ui/src/components/RuoYi/Git/index.vue b/ruoyi-ui/src/components/RuoYi/Git/index.vue deleted file mode 100644 index bdafbae..0000000 --- a/ruoyi-ui/src/components/RuoYi/Git/index.vue +++ /dev/null @@ -1,21 +0,0 @@ - - - \ No newline at end of file diff --git a/ruoyi-ui/src/components/Screenfull/index.vue b/ruoyi-ui/src/components/Screenfull/index.vue deleted file mode 100644 index d4e539c..0000000 --- a/ruoyi-ui/src/components/Screenfull/index.vue +++ /dev/null @@ -1,57 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/components/SizeSelect/index.vue b/ruoyi-ui/src/components/SizeSelect/index.vue deleted file mode 100644 index 069b5de..0000000 --- a/ruoyi-ui/src/components/SizeSelect/index.vue +++ /dev/null @@ -1,56 +0,0 @@ - - - diff --git a/ruoyi-ui/src/components/SvgIcon/index.vue b/ruoyi-ui/src/components/SvgIcon/index.vue deleted file mode 100644 index e4bf5ad..0000000 --- a/ruoyi-ui/src/components/SvgIcon/index.vue +++ /dev/null @@ -1,61 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/components/ThemePicker/index.vue b/ruoyi-ui/src/components/ThemePicker/index.vue deleted file mode 100644 index 1714e1f..0000000 --- a/ruoyi-ui/src/components/ThemePicker/index.vue +++ /dev/null @@ -1,173 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/components/TopNav/index.vue b/ruoyi-ui/src/components/TopNav/index.vue deleted file mode 100644 index 86a91c4..0000000 --- a/ruoyi-ui/src/components/TopNav/index.vue +++ /dev/null @@ -1,195 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/components/iFrame/index.vue b/ruoyi-ui/src/components/iFrame/index.vue deleted file mode 100644 index 426857f..0000000 --- a/ruoyi-ui/src/components/iFrame/index.vue +++ /dev/null @@ -1,36 +0,0 @@ - - - diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue deleted file mode 100644 index 466cd98..0000000 --- a/ruoyi-ui/src/layout/components/Navbar.vue +++ /dev/null @@ -1,200 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/layout/components/Settings/index.vue b/ruoyi-ui/src/layout/components/Settings/index.vue deleted file mode 100644 index bb3c9ce..0000000 --- a/ruoyi-ui/src/layout/components/Settings/index.vue +++ /dev/null @@ -1,260 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/layout/components/Sidebar/FixiOSBug.js b/ruoyi-ui/src/layout/components/Sidebar/FixiOSBug.js deleted file mode 100644 index 6823726..0000000 --- a/ruoyi-ui/src/layout/components/Sidebar/FixiOSBug.js +++ /dev/null @@ -1,25 +0,0 @@ -export default { - computed: { - device() { - return this.$store.state.app.device - } - }, - mounted() { - // In order to fix the click on menu on the ios device will trigger the mouseleave bug - this.fixBugIniOS() - }, - methods: { - fixBugIniOS() { - const $subMenu = this.$refs.subMenu - if ($subMenu) { - const handleMouseleave = $subMenu.handleMouseleave - $subMenu.handleMouseleave = (e) => { - if (this.device === 'mobile') { - return - } - handleMouseleave(e) - } - } - } - } -} diff --git a/ruoyi-ui/src/layout/components/Sidebar/Item.vue b/ruoyi-ui/src/layout/components/Sidebar/Item.vue deleted file mode 100644 index be3285d..0000000 --- a/ruoyi-ui/src/layout/components/Sidebar/Item.vue +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/ruoyi-ui/src/layout/components/Sidebar/Link.vue b/ruoyi-ui/src/layout/components/Sidebar/Link.vue deleted file mode 100644 index 8b0bc93..0000000 --- a/ruoyi-ui/src/layout/components/Sidebar/Link.vue +++ /dev/null @@ -1,43 +0,0 @@ - - - diff --git a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue deleted file mode 100644 index 2774cc8..0000000 --- a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue +++ /dev/null @@ -1,93 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue b/ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue deleted file mode 100644 index 82ba407..0000000 --- a/ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue +++ /dev/null @@ -1,100 +0,0 @@ - - - diff --git a/ruoyi-ui/src/layout/components/Sidebar/index.vue b/ruoyi-ui/src/layout/components/Sidebar/index.vue deleted file mode 100644 index 51d0839..0000000 --- a/ruoyi-ui/src/layout/components/Sidebar/index.vue +++ /dev/null @@ -1,57 +0,0 @@ - - - diff --git a/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue b/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue deleted file mode 100644 index bb753a1..0000000 --- a/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue +++ /dev/null @@ -1,94 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/layout/components/TagsView/index.vue b/ruoyi-ui/src/layout/components/TagsView/index.vue deleted file mode 100644 index 96585a5..0000000 --- a/ruoyi-ui/src/layout/components/TagsView/index.vue +++ /dev/null @@ -1,332 +0,0 @@ - - - - - - - diff --git a/ruoyi-ui/src/layout/components/index.js b/ruoyi-ui/src/layout/components/index.js deleted file mode 100644 index 104bd3a..0000000 --- a/ruoyi-ui/src/layout/components/index.js +++ /dev/null @@ -1,5 +0,0 @@ -export { default as AppMain } from './AppMain' -export { default as Navbar } from './Navbar' -export { default as Settings } from './Settings' -export { default as Sidebar } from './Sidebar/index.vue' -export { default as TagsView } from './TagsView/index.vue' diff --git a/ruoyi-ui/src/layout/index.vue b/ruoyi-ui/src/layout/index.vue deleted file mode 100644 index dba4393..0000000 --- a/ruoyi-ui/src/layout/index.vue +++ /dev/null @@ -1,111 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/layout/mixin/ResizeHandler.js b/ruoyi-ui/src/layout/mixin/ResizeHandler.js deleted file mode 100644 index e8d0df8..0000000 --- a/ruoyi-ui/src/layout/mixin/ResizeHandler.js +++ /dev/null @@ -1,45 +0,0 @@ -import store from '@/store' - -const { body } = document -const WIDTH = 992 // refer to Bootstrap's responsive design - -export default { - watch: { - $route(route) { - if (this.device === 'mobile' && this.sidebar.opened) { - store.dispatch('app/closeSideBar', { withoutAnimation: false }) - } - } - }, - beforeMount() { - window.addEventListener('resize', this.$_resizeHandler) - }, - beforeDestroy() { - window.removeEventListener('resize', this.$_resizeHandler) - }, - mounted() { - const isMobile = this.$_isMobile() - if (isMobile) { - store.dispatch('app/toggleDevice', 'mobile') - store.dispatch('app/closeSideBar', { withoutAnimation: true }) - } - }, - methods: { - // use $_ for mixins properties - // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential - $_isMobile() { - const rect = body.getBoundingClientRect() - return rect.width - 1 < WIDTH - }, - $_resizeHandler() { - if (!document.hidden) { - const isMobile = this.$_isMobile() - store.dispatch('app/toggleDevice', isMobile ? 'mobile' : 'desktop') - - if (isMobile) { - store.dispatch('app/closeSideBar', { withoutAnimation: true }) - } - } - } - } -} diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js deleted file mode 100644 index 13c6cf2..0000000 --- a/ruoyi-ui/src/main.js +++ /dev/null @@ -1,86 +0,0 @@ -import Vue from 'vue' - -import Cookies from 'js-cookie' - -import Element from 'element-ui' -import './assets/styles/element-variables.scss' - -import '@/assets/styles/index.scss' // global css -import '@/assets/styles/ruoyi.scss' // ruoyi css -import App from './App' -import store from './store' -import router from './router' -import directive from './directive' // directive -import plugins from './plugins' // plugins -import { download } from '@/utils/request' - -import './assets/icons' // icon -import './permission' // permission control -import { getDicts } from "@/api/system/dict/data"; -import { getConfigKey } from "@/api/system/config"; -import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi"; -// 鍒嗛〉缁勪欢 -import Pagination from "@/components/Pagination"; -// 鑷畾涔夎〃鏍煎伐鍏风粍浠 -import RightToolbar from "@/components/RightToolbar" -// 瀵屾枃鏈粍浠 -import Editor from "@/components/Editor" -// 鏂囦欢涓婁紶缁勪欢 -import FileUpload from "@/components/FileUpload" -// 鍥剧墖涓婁紶缁勪欢 -import ImageUpload from "@/components/ImageUpload" -// 鍥剧墖棰勮缁勪欢 -import ImagePreview from "@/components/ImagePreview" -// 瀛楀吀鏍囩缁勪欢 -import DictTag from '@/components/DictTag' -// 澶撮儴鏍囩缁勪欢 -import VueMeta from 'vue-meta' -// 瀛楀吀鏁版嵁缁勪欢 -import DictData from '@/components/DictData' - -// 鍏ㄥ眬鏂规硶鎸傝浇 -Vue.prototype.getDicts = getDicts -Vue.prototype.getConfigKey = getConfigKey -Vue.prototype.parseTime = parseTime -Vue.prototype.resetForm = resetForm -Vue.prototype.addDateRange = addDateRange -Vue.prototype.selectDictLabel = selectDictLabel -Vue.prototype.selectDictLabels = selectDictLabels -Vue.prototype.download = download -Vue.prototype.handleTree = handleTree - -// 鍏ㄥ眬缁勪欢鎸傝浇 -Vue.component('DictTag', DictTag) -Vue.component('Pagination', Pagination) -Vue.component('RightToolbar', RightToolbar) -Vue.component('Editor', Editor) -Vue.component('FileUpload', FileUpload) -Vue.component('ImageUpload', ImageUpload) -Vue.component('ImagePreview', ImagePreview) - -Vue.use(directive) -Vue.use(plugins) -Vue.use(VueMeta) -DictData.install() - -/** - * If you don't want to use mock-server - * you want to use MockJs for mock api - * you can execute: mockXHR() - * - * Currently MockJs will be used in the production environment, - * please remove it before going online! ! ! - */ - -Vue.use(Element, { - size: Cookies.get('size') || 'medium' // set element-ui default size -}) - -Vue.config.productionTip = false - -new Vue({ - el: '#app', - router, - store, - render: h => h(App) -}) diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js deleted file mode 100644 index c568979..0000000 --- a/ruoyi-ui/src/permission.js +++ /dev/null @@ -1,58 +0,0 @@ -import router from './router' -import store from './store' -import { Message } from 'element-ui' -import NProgress from 'nprogress' -import 'nprogress/nprogress.css' -import { getToken } from '@/utils/auth' -import { isRelogin } from '@/utils/request' - -NProgress.configure({ showSpinner: false }) - -const whiteList = ['/login', '/register'] - -router.beforeEach((to, from, next) => { - NProgress.start() - if (getToken()) { - to.meta.title && store.dispatch('settings/setTitle', to.meta.title) - /* has token*/ - if (to.path === '/login') { - next({ path: '/' }) - NProgress.done() - } else if (whiteList.indexOf(to.path) !== -1) { - next() - } else { - if (store.getters.roles.length === 0) { - isRelogin.show = true - // 鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁宸叉媺鍙栧畬user_info淇℃伅 - store.dispatch('GetInfo').then(() => { - isRelogin.show = false - store.dispatch('GenerateRoutes').then(accessRoutes => { - // 鏍规嵁roles鏉冮檺鐢熸垚鍙闂殑璺敱琛 - router.addRoutes(accessRoutes) // 鍔ㄦ佹坊鍔犲彲璁块棶璺敱琛 - next({ ...to, replace: true }) // hack鏂规硶 纭繚addRoutes宸插畬鎴 - }) - }).catch(err => { - store.dispatch('LogOut').then(() => { - Message.error(err) - next({ path: '/' }) - }) - }) - } else { - next() - } - } - } else { - // 娌℃湁token - if (whiteList.indexOf(to.path) !== -1) { - // 鍦ㄥ厤鐧诲綍鐧藉悕鍗曪紝鐩存帴杩涘叆 - next() - } else { - next(`/login?redirect=${encodeURIComponent(to.fullPath)}`) // 鍚﹀垯鍏ㄩ儴閲嶅畾鍚戝埌鐧诲綍椤 - NProgress.done() - } - } -}) - -router.afterEach(() => { - NProgress.done() -}) diff --git a/ruoyi-ui/src/plugins/auth.js b/ruoyi-ui/src/plugins/auth.js deleted file mode 100644 index 6c6bc24..0000000 --- a/ruoyi-ui/src/plugins/auth.js +++ /dev/null @@ -1,60 +0,0 @@ -import store from '@/store' - -function authPermission(permission) { - const all_permission = "*:*:*"; - const permissions = store.getters && store.getters.permissions - if (permission && permission.length > 0) { - return permissions.some(v => { - return all_permission === v || v === permission - }) - } else { - return false - } -} - -function authRole(role) { - const super_admin = "admin"; - const roles = store.getters && store.getters.roles - if (role && role.length > 0) { - return roles.some(v => { - return super_admin === v || v === role - }) - } else { - return false - } -} - -export default { - // 楠岃瘉鐢ㄦ埛鏄惁鍏峰鏌愭潈闄 - hasPermi(permission) { - return authPermission(permission); - }, - // 楠岃瘉鐢ㄦ埛鏄惁鍚湁鎸囧畾鏉冮檺锛屽彧闇鍖呭惈鍏朵腑涓涓 - hasPermiOr(permissions) { - return permissions.some(item => { - return authPermission(item) - }) - }, - // 楠岃瘉鐢ㄦ埛鏄惁鍚湁鎸囧畾鏉冮檺锛屽繀椤诲叏閮ㄦ嫢鏈 - hasPermiAnd(permissions) { - return permissions.every(item => { - return authPermission(item) - }) - }, - // 楠岃瘉鐢ㄦ埛鏄惁鍏峰鏌愯鑹 - hasRole(role) { - return authRole(role); - }, - // 楠岃瘉鐢ㄦ埛鏄惁鍚湁鎸囧畾瑙掕壊锛屽彧闇鍖呭惈鍏朵腑涓涓 - hasRoleOr(roles) { - return roles.some(item => { - return authRole(item) - }) - }, - // 楠岃瘉鐢ㄦ埛鏄惁鍚湁鎸囧畾瑙掕壊锛屽繀椤诲叏閮ㄦ嫢鏈 - hasRoleAnd(roles) { - return roles.every(item => { - return authRole(item) - }) - } -} diff --git a/ruoyi-ui/src/plugins/cache.js b/ruoyi-ui/src/plugins/cache.js deleted file mode 100644 index 6b5c00b..0000000 --- a/ruoyi-ui/src/plugins/cache.js +++ /dev/null @@ -1,77 +0,0 @@ -const sessionCache = { - set (key, value) { - if (!sessionStorage) { - return - } - if (key != null && value != null) { - sessionStorage.setItem(key, value) - } - }, - get (key) { - if (!sessionStorage) { - return null - } - if (key == null) { - return null - } - return sessionStorage.getItem(key) - }, - setJSON (key, jsonValue) { - if (jsonValue != null) { - this.set(key, JSON.stringify(jsonValue)) - } - }, - getJSON (key) { - const value = this.get(key) - if (value != null) { - return JSON.parse(value) - } - }, - remove (key) { - sessionStorage.removeItem(key); - } -} -const localCache = { - set (key, value) { - if (!localStorage) { - return - } - if (key != null && value != null) { - localStorage.setItem(key, value) - } - }, - get (key) { - if (!localStorage) { - return null - } - if (key == null) { - return null - } - return localStorage.getItem(key) - }, - setJSON (key, jsonValue) { - if (jsonValue != null) { - this.set(key, JSON.stringify(jsonValue)) - } - }, - getJSON (key) { - const value = this.get(key) - if (value != null) { - return JSON.parse(value) - } - }, - remove (key) { - localStorage.removeItem(key); - } -} - -export default { - /** - * 浼氳瘽绾х紦瀛 - */ - session: sessionCache, - /** - * 鏈湴缂撳瓨 - */ - local: localCache -} diff --git a/ruoyi-ui/src/plugins/download.js b/ruoyi-ui/src/plugins/download.js deleted file mode 100644 index 42acd00..0000000 --- a/ruoyi-ui/src/plugins/download.js +++ /dev/null @@ -1,79 +0,0 @@ -import axios from 'axios' -import {Loading, Message} from 'element-ui' -import { saveAs } from 'file-saver' -import { getToken } from '@/utils/auth' -import errorCode from '@/utils/errorCode' -import { blobValidate } from "@/utils/ruoyi"; - -const baseURL = process.env.VUE_APP_BASE_API -let downloadLoadingInstance; - -export default { - name(name, isDelete = true) { - var url = baseURL + "/common/download?fileName=" + encodeURIComponent(name) + "&delete=" + isDelete - axios({ - method: 'get', - url: url, - responseType: 'blob', - headers: { 'Authorization': 'Bearer ' + getToken() } - }).then((res) => { - const isBlob = blobValidate(res.data); - if (isBlob) { - const blob = new Blob([res.data]) - this.saveAs(blob, decodeURIComponent(res.headers['download-filename'])) - } else { - this.printErrMsg(res.data); - } - }) - }, - resource(resource) { - var url = baseURL + "/common/download/resource?resource=" + encodeURIComponent(resource); - axios({ - method: 'get', - url: url, - responseType: 'blob', - headers: { 'Authorization': 'Bearer ' + getToken() } - }).then((res) => { - const isBlob = blobValidate(res.data); - if (isBlob) { - const blob = new Blob([res.data]) - this.saveAs(blob, decodeURIComponent(res.headers['download-filename'])) - } else { - this.printErrMsg(res.data); - } - }) - }, - zip(url, name) { - var url = baseURL + url - downloadLoadingInstance = Loading.service({ text: "姝e湪涓嬭浇鏁版嵁锛岃绋嶅", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", }) - axios({ - method: 'get', - url: url, - responseType: 'blob', - headers: { 'Authorization': 'Bearer ' + getToken() } - }).then((res) => { - const isBlob = blobValidate(res.data); - if (isBlob) { - const blob = new Blob([res.data], { type: 'application/zip' }) - this.saveAs(blob, name) - } else { - this.printErrMsg(res.data); - } - downloadLoadingInstance.close(); - }).catch((r) => { - console.error(r) - Message.error('涓嬭浇鏂囦欢鍑虹幇閿欒锛岃鑱旂郴绠$悊鍛橈紒') - downloadLoadingInstance.close(); - }) - }, - saveAs(text, name, opts) { - saveAs(text, name, opts); - }, - async printErrMsg(data) { - const resText = await data.text(); - const rspObj = JSON.parse(resText); - const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default'] - Message.error(errMsg); - } -} - diff --git a/ruoyi-ui/src/plugins/index.js b/ruoyi-ui/src/plugins/index.js deleted file mode 100644 index d000f2d..0000000 --- a/ruoyi-ui/src/plugins/index.js +++ /dev/null @@ -1,20 +0,0 @@ -import tab from './tab' -import auth from './auth' -import cache from './cache' -import modal from './modal' -import download from './download' - -export default { - install(Vue) { - // 椤电鎿嶄綔 - Vue.prototype.$tab = tab - // 璁よ瘉瀵硅薄 - Vue.prototype.$auth = auth - // 缂撳瓨瀵硅薄 - Vue.prototype.$cache = cache - // 妯℃佹瀵硅薄 - Vue.prototype.$modal = modal - // 涓嬭浇鏂囦欢 - Vue.prototype.$download = download - } -} diff --git a/ruoyi-ui/src/plugins/modal.js b/ruoyi-ui/src/plugins/modal.js deleted file mode 100644 index b37ca14..0000000 --- a/ruoyi-ui/src/plugins/modal.js +++ /dev/null @@ -1,83 +0,0 @@ -import { Message, MessageBox, Notification, Loading } from 'element-ui' - -let loadingInstance; - -export default { - // 娑堟伅鎻愮ず - msg(content) { - Message.info(content) - }, - // 閿欒娑堟伅 - msgError(content) { - Message.error(content) - }, - // 鎴愬姛娑堟伅 - msgSuccess(content) { - Message.success(content) - }, - // 璀﹀憡娑堟伅 - msgWarning(content) { - Message.warning(content) - }, - // 寮瑰嚭鎻愮ず - alert(content) { - MessageBox.alert(content, "绯荤粺鎻愮ず") - }, - // 閿欒鎻愮ず - alertError(content) { - MessageBox.alert(content, "绯荤粺鎻愮ず", { type: 'error' }) - }, - // 鎴愬姛鎻愮ず - alertSuccess(content) { - MessageBox.alert(content, "绯荤粺鎻愮ず", { type: 'success' }) - }, - // 璀﹀憡鎻愮ず - alertWarning(content) { - MessageBox.alert(content, "绯荤粺鎻愮ず", { type: 'warning' }) - }, - // 閫氱煡鎻愮ず - notify(content) { - Notification.info(content) - }, - // 閿欒閫氱煡 - notifyError(content) { - Notification.error(content); - }, - // 鎴愬姛閫氱煡 - notifySuccess(content) { - Notification.success(content) - }, - // 璀﹀憡閫氱煡 - notifyWarning(content) { - Notification.warning(content) - }, - // 纭绐椾綋 - confirm(content) { - return MessageBox.confirm(content, "绯荤粺鎻愮ず", { - confirmButtonText: '纭畾', - cancelButtonText: '鍙栨秷', - type: "warning", - }) - }, - // 鎻愪氦鍐呭 - prompt(content) { - return MessageBox.prompt(content, "绯荤粺鎻愮ず", { - confirmButtonText: '纭畾', - cancelButtonText: '鍙栨秷', - type: "warning", - }) - }, - // 鎵撳紑閬僵灞 - loading(content) { - loadingInstance = Loading.service({ - lock: true, - text: content, - spinner: "el-icon-loading", - background: "rgba(0, 0, 0, 0.7)", - }) - }, - // 鍏抽棴閬僵灞 - closeLoading() { - loadingInstance.close(); - } -} diff --git a/ruoyi-ui/src/plugins/tab.js b/ruoyi-ui/src/plugins/tab.js deleted file mode 100644 index fcde419..0000000 --- a/ruoyi-ui/src/plugins/tab.js +++ /dev/null @@ -1,71 +0,0 @@ -import store from '@/store' -import router from '@/router'; - -export default { - // 鍒锋柊褰撳墠tab椤电 - refreshPage(obj) { - const { path, query, matched } = router.currentRoute; - if (obj === undefined) { - matched.forEach((m) => { - if (m.components && m.components.default && m.components.default.name) { - if (!['Layout', 'ParentView'].includes(m.components.default.name)) { - obj = { name: m.components.default.name, path: path, query: query }; - } - } - }); - } - return store.dispatch('tagsView/delCachedView', obj).then(() => { - const { path, query } = obj - router.replace({ - path: '/redirect' + path, - query: query - }) - }) - }, - // 鍏抽棴褰撳墠tab椤电锛屾墦寮鏂伴〉绛 - closeOpenPage(obj) { - store.dispatch("tagsView/delView", router.currentRoute); - if (obj !== undefined) { - return router.push(obj); - } - }, - // 鍏抽棴鎸囧畾tab椤电 - closePage(obj) { - if (obj === undefined) { - return store.dispatch('tagsView/delView', router.currentRoute).then(({ visitedViews }) => { - const latestView = visitedViews.slice(-1)[0] - if (latestView) { - return router.push(latestView.fullPath) - } - return router.push('/'); - }); - } - return store.dispatch('tagsView/delView', obj); - }, - // 鍏抽棴鎵鏈塼ab椤电 - closeAllPage() { - return store.dispatch('tagsView/delAllViews'); - }, - // 鍏抽棴宸︿晶tab椤电 - closeLeftPage(obj) { - return store.dispatch('tagsView/delLeftTags', obj || router.currentRoute); - }, - // 鍏抽棴鍙充晶tab椤电 - closeRightPage(obj) { - return store.dispatch('tagsView/delRightTags', obj || router.currentRoute); - }, - // 鍏抽棴鍏朵粬tab椤电 - closeOtherPage(obj) { - return store.dispatch('tagsView/delOthersViews', obj || router.currentRoute); - }, - // 娣诲姞tab椤电 - openPage(title, url, params) { - const obj = { path: url, meta: { title: title } } - store.dispatch('tagsView/addView', obj); - return router.push({ path: url, query: params }); - }, - // 淇敼tab椤电 - updatePage(obj) { - return store.dispatch('tagsView/updateVisitedView', obj); - } -} diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js deleted file mode 100644 index 71907b6..0000000 --- a/ruoyi-ui/src/router/index.js +++ /dev/null @@ -1,183 +0,0 @@ -import Vue from 'vue' -import Router from 'vue-router' - -Vue.use(Router) - -/* Layout */ -import Layout from '@/layout' - -/** - * Note: 璺敱閰嶇疆椤 - * - * hidden: true // 褰撹缃 true 鐨勬椂鍊欒璺敱涓嶄細鍐嶄晶杈规爮鍑虹幇 濡401锛宭ogin绛夐〉闈紝鎴栬呭涓浜涚紪杈戦〉闈/edit/1 - * alwaysShow: true // 褰撲綘涓涓矾鐢变笅闈㈢殑 children 澹版槑鐨勮矾鐢卞ぇ浜1涓椂锛岃嚜鍔ㄤ細鍙樻垚宓屽鐨勬ā寮--濡傜粍浠堕〉闈 - * // 鍙湁涓涓椂锛屼細灏嗛偅涓瓙璺敱褰撳仛鏍硅矾鐢辨樉绀哄湪渚ц竟鏍--濡傚紩瀵奸〉闈 - * // 鑻ヤ綘鎯充笉绠¤矾鐢变笅闈㈢殑 children 澹版槑鐨勪釜鏁伴兘鏄剧ず浣犵殑鏍硅矾鐢 - * // 浣犲彲浠ヨ缃 alwaysShow: true锛岃繖鏍峰畠灏变細蹇界暐涔嬪墠瀹氫箟鐨勮鍒欙紝涓鐩存樉绀烘牴璺敱 - * redirect: noRedirect // 褰撹缃 noRedirect 鐨勬椂鍊欒璺敱鍦ㄩ潰鍖呭睉瀵艰埅涓笉鍙鐐瑰嚮 - * name:'router-name' // 璁惧畾璺敱鐨勫悕瀛楋紝涓瀹氳濉啓涓嶇劧浣跨敤鏃朵細鍑虹幇鍚勭闂 - * query: '{"id": 1, "name": "ry"}' // 璁块棶璺敱鐨勯粯璁や紶閫掑弬鏁 - * roles: ['admin', 'common'] // 璁块棶璺敱鐨勮鑹叉潈闄 - * permissions: ['a:a:a', 'b:b:b'] // 璁块棶璺敱鐨勮彍鍗曟潈闄 - * meta : { - noCache: true // 濡傛灉璁剧疆涓簍rue锛屽垯涓嶄細琚 缂撳瓨(榛樿 false) - title: 'title' // 璁剧疆璇ヨ矾鐢卞湪渚ц竟鏍忓拰闈㈠寘灞戜腑灞曠ず鐨勫悕瀛 - icon: 'svg-name' // 璁剧疆璇ヨ矾鐢辩殑鍥炬爣锛屽搴旇矾寰剆rc/assets/icons/svg - breadcrumb: false // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず - activeMenu: '/system/user' // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋 - } - */ - -// 鍏叡璺敱 -export const constantRoutes = [ - { - path: '/redirect', - component: Layout, - hidden: true, - children: [ - { - path: '/redirect/:path(.*)', - component: () => import('@/views/redirect') - } - ] - }, - { - path: '/login', - component: () => import('@/views/login'), - hidden: true - }, - { - path: '/register', - component: () => import('@/views/register'), - hidden: true - }, - { - path: '/404', - component: () => import('@/views/error/404'), - hidden: true - }, - { - path: '/401', - component: () => import('@/views/error/401'), - hidden: true - }, - { - path: '', - component: Layout, - redirect: 'index', - children: [ - { - path: 'index', - component: () => import('@/views/index'), - name: 'Index', - meta: { title: '棣栭〉', icon: 'dashboard', affix: true } - } - ] - }, - { - path: '/user', - component: Layout, - hidden: true, - redirect: 'noredirect', - children: [ - { - path: 'profile', - component: () => import('@/views/system/user/profile/index'), - name: 'Profile', - meta: { title: '涓汉涓績', icon: 'user' } - } - ] - } -] - -// 鍔ㄦ佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ佸幓鍔犺浇 -export const dynamicRoutes = [ - { - path: '/system/user-auth', - component: Layout, - hidden: true, - permissions: ['system:user:edit'], - children: [ - { - path: 'role/:userId(\\d+)', - component: () => import('@/views/system/user/authRole'), - name: 'AuthRole', - meta: { title: '鍒嗛厤瑙掕壊', activeMenu: '/system/user' } - } - ] - }, - { - path: '/system/role-auth', - component: Layout, - hidden: true, - permissions: ['system:role:edit'], - children: [ - { - path: 'user/:roleId(\\d+)', - component: () => import('@/views/system/role/authUser'), - name: 'AuthUser', - meta: { title: '鍒嗛厤鐢ㄦ埛', activeMenu: '/system/role' } - } - ] - }, - { - path: '/system/dict-data', - component: Layout, - hidden: true, - permissions: ['system:dict:list'], - children: [ - { - path: 'index/:dictId(\\d+)', - component: () => import('@/views/system/dict/data'), - name: 'Data', - meta: { title: '瀛楀吀鏁版嵁', activeMenu: '/system/dict' } - } - ] - }, - { - path: '/monitor/job-log', - component: Layout, - hidden: true, - permissions: ['monitor:job:list'], - children: [ - { - path: 'index/:jobId(\\d+)', - component: () => import('@/views/monitor/job/log'), - name: 'JobLog', - meta: { title: '璋冨害鏃ュ織', activeMenu: '/monitor/job' } - } - ] - }, - { - path: '/tool/gen-edit', - component: Layout, - hidden: true, - permissions: ['tool:gen:edit'], - children: [ - { - path: 'index/:tableId(\\d+)', - component: () => import('@/views/tool/gen/editTable'), - name: 'GenEdit', - meta: { title: '淇敼鐢熸垚閰嶇疆', activeMenu: '/tool/gen' } - } - ] - } -] - -// 闃叉杩炵画鐐瑰嚮澶氭璺敱鎶ラ敊 -let routerPush = Router.prototype.push; -let routerReplace = Router.prototype.replace; -// push -Router.prototype.push = function push(location) { - return routerPush.call(this, location).catch(err => err) -} -// replace -Router.prototype.replace = function push(location) { - return routerReplace.call(this, location).catch(err => err) -} - -export default new Router({ - mode: 'history', // 鍘绘帀url涓殑# - scrollBehavior: () => ({ y: 0 }), - routes: constantRoutes -}) diff --git a/ruoyi-ui/src/settings.js b/ruoyi-ui/src/settings.js deleted file mode 100644 index 6a0b09f..0000000 --- a/ruoyi-ui/src/settings.js +++ /dev/null @@ -1,44 +0,0 @@ -module.exports = { - /** - * 渚ц竟鏍忎富棰 娣辫壊涓婚theme-dark锛屾祬鑹蹭富棰榯heme-light - */ - sideTheme: 'theme-dark', - - /** - * 鏄惁绯荤粺甯冨眬閰嶇疆 - */ - showSettings: false, - - /** - * 鏄惁鏄剧ず椤堕儴瀵艰埅 - */ - topNav: false, - - /** - * 鏄惁鏄剧ず tagsView - */ - tagsView: true, - - /** - * 鏄惁鍥哄畾澶撮儴 - */ - fixedHeader: false, - - /** - * 鏄惁鏄剧ずlogo - */ - sidebarLogo: true, - - /** - * 鏄惁鏄剧ず鍔ㄦ佹爣棰 - */ - dynamicTitle: false, - - /** - * @type {string | array} 'production' | ['production', 'development'] - * @description Need show err logs component. - * The default is only used in the production env - * If you want to also use it in dev, you can pass ['production', 'development'] - */ - errorLog: 'production' -} diff --git a/ruoyi-ui/src/store/getters.js b/ruoyi-ui/src/store/getters.js deleted file mode 100644 index 8adb1b6..0000000 --- a/ruoyi-ui/src/store/getters.js +++ /dev/null @@ -1,19 +0,0 @@ -const getters = { - sidebar: state => state.app.sidebar, - size: state => state.app.size, - device: state => state.app.device, - dict: state => state.dict.dict, - visitedViews: state => state.tagsView.visitedViews, - cachedViews: state => state.tagsView.cachedViews, - token: state => state.user.token, - avatar: state => state.user.avatar, - name: state => state.user.name, - introduction: state => state.user.introduction, - roles: state => state.user.roles, - permissions: state => state.user.permissions, - permission_routes: state => state.permission.routes, - topbarRouters:state => state.permission.topbarRouters, - defaultRoutes:state => state.permission.defaultRoutes, - sidebarRouters:state => state.permission.sidebarRouters, -} -export default getters diff --git a/ruoyi-ui/src/store/index.js b/ruoyi-ui/src/store/index.js deleted file mode 100644 index 97aaef8..0000000 --- a/ruoyi-ui/src/store/index.js +++ /dev/null @@ -1,25 +0,0 @@ -import Vue from 'vue' -import Vuex from 'vuex' -import app from './modules/app' -import dict from './modules/dict' -import user from './modules/user' -import tagsView from './modules/tagsView' -import permission from './modules/permission' -import settings from './modules/settings' -import getters from './getters' - -Vue.use(Vuex) - -const store = new Vuex.Store({ - modules: { - app, - dict, - user, - tagsView, - permission, - settings - }, - getters -}) - -export default store diff --git a/ruoyi-ui/src/store/modules/app.js b/ruoyi-ui/src/store/modules/app.js deleted file mode 100644 index 3e22d1c..0000000 --- a/ruoyi-ui/src/store/modules/app.js +++ /dev/null @@ -1,66 +0,0 @@ -import Cookies from 'js-cookie' - -const state = { - sidebar: { - opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true, - withoutAnimation: false, - hide: false - }, - device: 'desktop', - size: Cookies.get('size') || 'medium' -} - -const mutations = { - TOGGLE_SIDEBAR: state => { - if (state.sidebar.hide) { - return false; - } - state.sidebar.opened = !state.sidebar.opened - state.sidebar.withoutAnimation = false - if (state.sidebar.opened) { - Cookies.set('sidebarStatus', 1) - } else { - Cookies.set('sidebarStatus', 0) - } - }, - CLOSE_SIDEBAR: (state, withoutAnimation) => { - Cookies.set('sidebarStatus', 0) - state.sidebar.opened = false - state.sidebar.withoutAnimation = withoutAnimation - }, - TOGGLE_DEVICE: (state, device) => { - state.device = device - }, - SET_SIZE: (state, size) => { - state.size = size - Cookies.set('size', size) - }, - SET_SIDEBAR_HIDE: (state, status) => { - state.sidebar.hide = status - } -} - -const actions = { - toggleSideBar({ commit }) { - commit('TOGGLE_SIDEBAR') - }, - closeSideBar({ commit }, { withoutAnimation }) { - commit('CLOSE_SIDEBAR', withoutAnimation) - }, - toggleDevice({ commit }, device) { - commit('TOGGLE_DEVICE', device) - }, - setSize({ commit }, size) { - commit('SET_SIZE', size) - }, - toggleSideBarHide({ commit }, status) { - commit('SET_SIDEBAR_HIDE', status) - } -} - -export default { - namespaced: true, - state, - mutations, - actions -} diff --git a/ruoyi-ui/src/store/modules/dict.js b/ruoyi-ui/src/store/modules/dict.js deleted file mode 100644 index 7a1b2f0..0000000 --- a/ruoyi-ui/src/store/modules/dict.js +++ /dev/null @@ -1,50 +0,0 @@ -const state = { - dict: new Array() -} -const mutations = { - SET_DICT: (state, { key, value }) => { - if (key !== null && key !== "") { - state.dict.push({ - key: key, - value: value - }) - } - }, - REMOVE_DICT: (state, key) => { - try { - for (let i = 0; i < state.dict.length; i++) { - if (state.dict[i].key == key) { - state.dict.splice(i, 1) - return true - } - } - } catch (e) { - } - }, - CLEAN_DICT: (state) => { - state.dict = new Array() - } -} - -const actions = { - // 璁剧疆瀛楀吀 - setDict({ commit }, data) { - commit('SET_DICT', data) - }, - // 鍒犻櫎瀛楀吀 - removeDict({ commit }, key) { - commit('REMOVE_DICT', key) - }, - // 娓呯┖瀛楀吀 - cleanDict({ commit }) { - commit('CLEAN_DICT') - } -} - -export default { - namespaced: true, - state, - mutations, - actions -} - diff --git a/ruoyi-ui/src/store/modules/permission.js b/ruoyi-ui/src/store/modules/permission.js deleted file mode 100644 index b3c216a..0000000 --- a/ruoyi-ui/src/store/modules/permission.js +++ /dev/null @@ -1,137 +0,0 @@ -import auth from '@/plugins/auth' -import router, { constantRoutes, dynamicRoutes } from '@/router' -import { getRouters } from '@/api/menu' -import Layout from '@/layout/index' -import ParentView from '@/components/ParentView' -import InnerLink from '@/layout/components/InnerLink' - -const permission = { - state: { - routes: [], - addRoutes: [], - defaultRoutes: [], - topbarRouters: [], - sidebarRouters: [] - }, - mutations: { - SET_ROUTES: (state, routes) => { - state.addRoutes = routes - state.routes = constantRoutes.concat(routes) - }, - SET_DEFAULT_ROUTES: (state, routes) => { - state.defaultRoutes = constantRoutes.concat(routes) - }, - SET_TOPBAR_ROUTES: (state, routes) => { - state.topbarRouters = routes - }, - SET_SIDEBAR_ROUTERS: (state, routes) => { - state.sidebarRouters = routes - }, - }, - actions: { - // 鐢熸垚璺敱 - GenerateRoutes({ commit }) { - return new Promise(resolve => { - // 鍚戝悗绔姹傝矾鐢辨暟鎹 - getRouters().then(res => { - const sdata = JSON.parse(JSON.stringify(res.data)) - const rdata = JSON.parse(JSON.stringify(res.data)) - const sidebarRoutes = filterAsyncRouter(sdata) - const rewriteRoutes = filterAsyncRouter(rdata, false, true) - const asyncRoutes = filterDynamicRoutes(dynamicRoutes); - rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true }) - router.addRoutes(asyncRoutes); - commit('SET_ROUTES', rewriteRoutes) - commit('SET_SIDEBAR_ROUTERS', constantRoutes.concat(sidebarRoutes)) - commit('SET_DEFAULT_ROUTES', sidebarRoutes) - commit('SET_TOPBAR_ROUTES', sidebarRoutes) - resolve(rewriteRoutes) - }) - }) - } - } -} - -// 閬嶅巻鍚庡彴浼犳潵鐨勮矾鐢卞瓧绗︿覆锛岃浆鎹负缁勪欢瀵硅薄 -function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) { - return asyncRouterMap.filter(route => { - if (type && route.children) { - route.children = filterChildren(route.children) - } - if (route.component) { - // Layout ParentView 缁勪欢鐗规畩澶勭悊 - if (route.component === 'Layout') { - route.component = Layout - } else if (route.component === 'ParentView') { - route.component = ParentView - } else if (route.component === 'InnerLink') { - route.component = InnerLink - } else { - route.component = loadView(route.component) - } - } - if (route.children != null && route.children && route.children.length) { - route.children = filterAsyncRouter(route.children, route, type) - } else { - delete route['children'] - delete route['redirect'] - } - return true - }) -} - -function filterChildren(childrenMap, lastRouter = false) { - var children = [] - childrenMap.forEach((el, index) => { - if (el.children && el.children.length) { - if (el.component === 'ParentView' && !lastRouter) { - el.children.forEach(c => { - c.path = el.path + '/' + c.path - if (c.children && c.children.length) { - children = children.concat(filterChildren(c.children, c)) - return - } - children.push(c) - }) - return - } - } - if (lastRouter) { - el.path = lastRouter.path + '/' + el.path - if (el.children && el.children.length) { - children = children.concat(filterChildren(el.children, el)) - return - } - } - children = children.concat(el) - }) - return children -} - -// 鍔ㄦ佽矾鐢遍亶鍘嗭紝楠岃瘉鏄惁鍏峰鏉冮檺 -export function filterDynamicRoutes(routes) { - const res = [] - routes.forEach(route => { - if (route.permissions) { - if (auth.hasPermiOr(route.permissions)) { - res.push(route) - } - } else if (route.roles) { - if (auth.hasRoleOr(route.roles)) { - res.push(route) - } - } - }) - return res -} - -export const loadView = (view) => { - if (process.env.NODE_ENV === 'development') { - return (resolve) => require([`@/views/${view}`], resolve) - } else { - // 浣跨敤 import 瀹炵幇鐢熶骇鐜鐨勮矾鐢辨噿鍔犺浇 - return () => import(`@/views/${view}`) - } -} - -export default permission diff --git a/ruoyi-ui/src/store/modules/settings.js b/ruoyi-ui/src/store/modules/settings.js deleted file mode 100644 index 2455a1e..0000000 --- a/ruoyi-ui/src/store/modules/settings.js +++ /dev/null @@ -1,42 +0,0 @@ -import defaultSettings from '@/settings' - -const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dynamicTitle } = defaultSettings - -const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || '' -const state = { - title: '', - theme: storageSetting.theme || '#409EFF', - sideTheme: storageSetting.sideTheme || sideTheme, - showSettings: showSettings, - topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav, - tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView, - fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader, - sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo, - dynamicTitle: storageSetting.dynamicTitle === undefined ? dynamicTitle : storageSetting.dynamicTitle -} -const mutations = { - CHANGE_SETTING: (state, { key, value }) => { - if (state.hasOwnProperty(key)) { - state[key] = value - } - } -} - -const actions = { - // 淇敼甯冨眬璁剧疆 - changeSetting({ commit }, data) { - commit('CHANGE_SETTING', data) - }, - // 璁剧疆缃戦〉鏍囬 - setTitle({ commit }, title) { - state.title = title - } -} - -export default { - namespaced: true, - state, - mutations, - actions -} - diff --git a/ruoyi-ui/src/store/modules/tagsView.js b/ruoyi-ui/src/store/modules/tagsView.js deleted file mode 100644 index 5fc011c..0000000 --- a/ruoyi-ui/src/store/modules/tagsView.js +++ /dev/null @@ -1,228 +0,0 @@ -const state = { - visitedViews: [], - cachedViews: [], - iframeViews: [] -} - -const mutations = { - ADD_IFRAME_VIEW: (state, view) => { - if (state.iframeViews.some(v => v.path === view.path)) return - state.iframeViews.push( - Object.assign({}, view, { - title: view.meta.title || 'no-name' - }) - ) - }, - ADD_VISITED_VIEW: (state, view) => { - if (state.visitedViews.some(v => v.path === view.path)) return - state.visitedViews.push( - Object.assign({}, view, { - title: view.meta.title || 'no-name' - }) - ) - }, - ADD_CACHED_VIEW: (state, view) => { - if (state.cachedViews.includes(view.name)) return - if (view.meta && !view.meta.noCache) { - state.cachedViews.push(view.name) - } - }, - DEL_VISITED_VIEW: (state, view) => { - for (const [i, v] of state.visitedViews.entries()) { - if (v.path === view.path) { - state.visitedViews.splice(i, 1) - break - } - } - state.iframeViews = state.iframeViews.filter(item => item.path !== view.path) - }, - DEL_IFRAME_VIEW: (state, view) => { - state.iframeViews = state.iframeViews.filter(item => item.path !== view.path) - }, - DEL_CACHED_VIEW: (state, view) => { - const index = state.cachedViews.indexOf(view.name) - index > -1 && state.cachedViews.splice(index, 1) - }, - - DEL_OTHERS_VISITED_VIEWS: (state, view) => { - state.visitedViews = state.visitedViews.filter(v => { - return v.meta.affix || v.path === view.path - }) - state.iframeViews = state.iframeViews.filter(item => item.path === view.path) - }, - DEL_OTHERS_CACHED_VIEWS: (state, view) => { - const index = state.cachedViews.indexOf(view.name) - if (index > -1) { - state.cachedViews = state.cachedViews.slice(index, index + 1) - } else { - state.cachedViews = [] - } - }, - DEL_ALL_VISITED_VIEWS: state => { - // keep affix tags - const affixTags = state.visitedViews.filter(tag => tag.meta.affix) - state.visitedViews = affixTags - state.iframeViews = [] - }, - DEL_ALL_CACHED_VIEWS: state => { - state.cachedViews = [] - }, - UPDATE_VISITED_VIEW: (state, view) => { - for (let v of state.visitedViews) { - if (v.path === view.path) { - v = Object.assign(v, view) - break - } - } - }, - DEL_RIGHT_VIEWS: (state, view) => { - const index = state.visitedViews.findIndex(v => v.path === view.path) - if (index === -1) { - return - } - state.visitedViews = state.visitedViews.filter((item, idx) => { - if (idx <= index || (item.meta && item.meta.affix)) { - return true - } - const i = state.cachedViews.indexOf(item.name) - if (i > -1) { - state.cachedViews.splice(i, 1) - } - if(item.meta.link) { - const fi = state.iframeViews.findIndex(v => v.path === item.path) - state.iframeViews.splice(fi, 1) - } - return false - }) - }, - DEL_LEFT_VIEWS: (state, view) => { - const index = state.visitedViews.findIndex(v => v.path === view.path) - if (index === -1) { - return - } - state.visitedViews = state.visitedViews.filter((item, idx) => { - if (idx >= index || (item.meta && item.meta.affix)) { - return true - } - const i = state.cachedViews.indexOf(item.name) - if (i > -1) { - state.cachedViews.splice(i, 1) - } - if(item.meta.link) { - const fi = state.iframeViews.findIndex(v => v.path === item.path) - state.iframeViews.splice(fi, 1) - } - return false - }) - } -} - -const actions = { - addView({ dispatch }, view) { - dispatch('addVisitedView', view) - dispatch('addCachedView', view) - }, - addIframeView({ commit }, view) { - commit('ADD_IFRAME_VIEW', view) - }, - addVisitedView({ commit }, view) { - commit('ADD_VISITED_VIEW', view) - }, - addCachedView({ commit }, view) { - commit('ADD_CACHED_VIEW', view) - }, - delView({ dispatch, state }, view) { - return new Promise(resolve => { - dispatch('delVisitedView', view) - dispatch('delCachedView', view) - resolve({ - visitedViews: [...state.visitedViews], - cachedViews: [...state.cachedViews] - }) - }) - }, - delVisitedView({ commit, state }, view) { - return new Promise(resolve => { - commit('DEL_VISITED_VIEW', view) - resolve([...state.visitedViews]) - }) - }, - delIframeView({ commit, state }, view) { - return new Promise(resolve => { - commit('DEL_IFRAME_VIEW', view) - resolve([...state.iframeViews]) - }) - }, - delCachedView({ commit, state }, view) { - return new Promise(resolve => { - commit('DEL_CACHED_VIEW', view) - resolve([...state.cachedViews]) - }) - }, - delOthersViews({ dispatch, state }, view) { - return new Promise(resolve => { - dispatch('delOthersVisitedViews', view) - dispatch('delOthersCachedViews', view) - resolve({ - visitedViews: [...state.visitedViews], - cachedViews: [...state.cachedViews] - }) - }) - }, - delOthersVisitedViews({ commit, state }, view) { - return new Promise(resolve => { - commit('DEL_OTHERS_VISITED_VIEWS', view) - resolve([...state.visitedViews]) - }) - }, - delOthersCachedViews({ commit, state }, view) { - return new Promise(resolve => { - commit('DEL_OTHERS_CACHED_VIEWS', view) - resolve([...state.cachedViews]) - }) - }, - delAllViews({ dispatch, state }, view) { - return new Promise(resolve => { - dispatch('delAllVisitedViews', view) - dispatch('delAllCachedViews', view) - resolve({ - visitedViews: [...state.visitedViews], - cachedViews: [...state.cachedViews] - }) - }) - }, - delAllVisitedViews({ commit, state }) { - return new Promise(resolve => { - commit('DEL_ALL_VISITED_VIEWS') - resolve([...state.visitedViews]) - }) - }, - delAllCachedViews({ commit, state }) { - return new Promise(resolve => { - commit('DEL_ALL_CACHED_VIEWS') - resolve([...state.cachedViews]) - }) - }, - updateVisitedView({ commit }, view) { - commit('UPDATE_VISITED_VIEW', view) - }, - delRightTags({ commit }, view) { - return new Promise(resolve => { - commit('DEL_RIGHT_VIEWS', view) - resolve([...state.visitedViews]) - }) - }, - delLeftTags({ commit }, view) { - return new Promise(resolve => { - commit('DEL_LEFT_VIEWS', view) - resolve([...state.visitedViews]) - }) - }, -} - -export default { - namespaced: true, - state, - mutations, - actions -} diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js deleted file mode 100644 index cdbab1e..0000000 --- a/ruoyi-ui/src/store/modules/user.js +++ /dev/null @@ -1,101 +0,0 @@ -import { login, logout, getInfo } from '@/api/login' -import { getToken, setToken, removeToken } from '@/utils/auth' - -const user = { - state: { - token: getToken(), - id: '', - name: '', - avatar: '', - roles: [], - permissions: [] - }, - - mutations: { - SET_TOKEN: (state, token) => { - state.token = token - }, - SET_ID: (state, id) => { - state.id = id - }, - SET_NAME: (state, name) => { - state.name = name - }, - SET_AVATAR: (state, avatar) => { - state.avatar = avatar - }, - SET_ROLES: (state, roles) => { - state.roles = roles - }, - SET_PERMISSIONS: (state, permissions) => { - state.permissions = permissions - } - }, - - actions: { - // 鐧诲綍 - Login({ commit }, userInfo) { - const username = userInfo.username.trim() - const password = userInfo.password - const code = userInfo.code - const uuid = userInfo.uuid - return new Promise((resolve, reject) => { - login(username, password, code, uuid).then(res => { - setToken(res.token) - commit('SET_TOKEN', res.token) - resolve() - }).catch(error => { - reject(error) - }) - }) - }, - - // 鑾峰彇鐢ㄦ埛淇℃伅 - GetInfo({ commit, state }) { - return new Promise((resolve, reject) => { - getInfo().then(res => { - const user = res.user - const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar; - if (res.roles && res.roles.length > 0) { // 楠岃瘉杩斿洖鐨剅oles鏄惁鏄竴涓潪绌烘暟缁 - commit('SET_ROLES', res.roles) - commit('SET_PERMISSIONS', res.permissions) - } else { - commit('SET_ROLES', ['ROLE_DEFAULT']) - } - commit('SET_ID', user.userId) - commit('SET_NAME', user.userName) - commit('SET_AVATAR', avatar) - resolve(res) - }).catch(error => { - reject(error) - }) - }) - }, - - // 閫鍑虹郴缁 - LogOut({ commit, state }) { - return new Promise((resolve, reject) => { - logout(state.token).then(() => { - commit('SET_TOKEN', '') - commit('SET_ROLES', []) - commit('SET_PERMISSIONS', []) - removeToken() - resolve() - }).catch(error => { - reject(error) - }) - }) - }, - - // 鍓嶇 鐧诲嚭 - FedLogOut({ commit }) { - return new Promise(resolve => { - commit('SET_TOKEN', '') - removeToken() - resolve() - }) - } - } -} - -export default user diff --git a/ruoyi-ui/src/utils/auth.js b/ruoyi-ui/src/utils/auth.js deleted file mode 100644 index 08a43d6..0000000 --- a/ruoyi-ui/src/utils/auth.js +++ /dev/null @@ -1,15 +0,0 @@ -import Cookies from 'js-cookie' - -const TokenKey = 'Admin-Token' - -export function getToken() { - return Cookies.get(TokenKey) -} - -export function setToken(token) { - return Cookies.set(TokenKey, token) -} - -export function removeToken() { - return Cookies.remove(TokenKey) -} diff --git a/ruoyi-ui/src/utils/dict/Dict.js b/ruoyi-ui/src/utils/dict/Dict.js deleted file mode 100644 index 104bd6e..0000000 --- a/ruoyi-ui/src/utils/dict/Dict.js +++ /dev/null @@ -1,82 +0,0 @@ -import Vue from 'vue' -import { mergeRecursive } from "@/utils/ruoyi"; -import DictMeta from './DictMeta' -import DictData from './DictData' - -const DEFAULT_DICT_OPTIONS = { - types: [], -} - -/** - * @classdesc 瀛楀吀 - * @property {Object} label 鏍囩瀵硅薄锛屽唴閮ㄥ睘鎬у悕涓哄瓧鍏哥被鍨嬪悕绉 - * @property {Object} dict 瀛楁鏁扮粍锛屽唴閮ㄥ睘鎬у悕涓哄瓧鍏哥被鍨嬪悕绉 - * @property {Array.} _dictMetas 瀛楀吀鍏冩暟鎹暟缁 - */ -export default class Dict { - constructor() { - this.owner = null - this.label = {} - this.type = {} - } - - init(options) { - if (options instanceof Array) { - options = { types: options } - } - const opts = mergeRecursive(DEFAULT_DICT_OPTIONS, options) - if (opts.types === undefined) { - throw new Error('need dict types') - } - const ps = [] - this._dictMetas = opts.types.map(t => DictMeta.parse(t)) - this._dictMetas.forEach(dictMeta => { - const type = dictMeta.type - Vue.set(this.label, type, {}) - Vue.set(this.type, type, []) - if (dictMeta.lazy) { - return - } - ps.push(loadDict(this, dictMeta)) - }) - return Promise.all(ps) - } - - /** - * 閲嶆柊鍔犺浇瀛楀吀 - * @param {String} type 瀛楀吀绫诲瀷 - */ - reloadDict(type) { - const dictMeta = this._dictMetas.find(e => e.type === type) - if (dictMeta === undefined) { - return Promise.reject(`the dict meta of ${type} was not found`) - } - return loadDict(this, dictMeta) - } -} - -/** - * 鍔犺浇瀛楀吀 - * @param {Dict} dict 瀛楀吀 - * @param {DictMeta} dictMeta 瀛楀吀鍏冩暟鎹 - * @returns {Promise} - */ -function loadDict(dict, dictMeta) { - return dictMeta.request(dictMeta) - .then(response => { - const type = dictMeta.type - let dicts = dictMeta.responseConverter(response, dictMeta) - if (!(dicts instanceof Array)) { - console.error('the return of responseConverter must be Array.') - dicts = [] - } else if (dicts.filter(d => d instanceof DictData).length !== dicts.length) { - console.error('the type of elements in dicts must be DictData') - dicts = [] - } - dict.type[type].splice(0, Number.MAX_SAFE_INTEGER, ...dicts) - dicts.forEach(d => { - Vue.set(dict.label[type], d.value, d.label) - }) - return dicts - }) -} diff --git a/ruoyi-ui/src/utils/dict/DictConverter.js b/ruoyi-ui/src/utils/dict/DictConverter.js deleted file mode 100644 index 0cf5df8..0000000 --- a/ruoyi-ui/src/utils/dict/DictConverter.js +++ /dev/null @@ -1,17 +0,0 @@ -import DictOptions from './DictOptions' -import DictData from './DictData' - -export default function(dict, dictMeta) { - const label = determineDictField(dict, dictMeta.labelField, ...DictOptions.DEFAULT_LABEL_FIELDS) - const value = determineDictField(dict, dictMeta.valueField, ...DictOptions.DEFAULT_VALUE_FIELDS) - return new DictData(dict[label], dict[value], dict) -} - -/** - * 纭畾瀛楀吀瀛楁 - * @param {DictData} dict - * @param {...String} fields - */ -function determineDictField(dict, ...fields) { - return fields.find(f => Object.prototype.hasOwnProperty.call(dict, f)) -} diff --git a/ruoyi-ui/src/utils/dict/DictData.js b/ruoyi-ui/src/utils/dict/DictData.js deleted file mode 100644 index afc763e..0000000 --- a/ruoyi-ui/src/utils/dict/DictData.js +++ /dev/null @@ -1,13 +0,0 @@ -/** - * @classdesc 瀛楀吀鏁版嵁 - * @property {String} label 鏍囩 - * @property {*} value 鏍囩 - * @property {Object} raw 鍘熷鏁版嵁 - */ -export default class DictData { - constructor(label, value, raw) { - this.label = label - this.value = value - this.raw = raw - } -} diff --git a/ruoyi-ui/src/utils/dict/DictMeta.js b/ruoyi-ui/src/utils/dict/DictMeta.js deleted file mode 100644 index 9779daa..0000000 --- a/ruoyi-ui/src/utils/dict/DictMeta.js +++ /dev/null @@ -1,38 +0,0 @@ -import { mergeRecursive } from "@/utils/ruoyi"; -import DictOptions from './DictOptions' - -/** - * @classdesc 瀛楀吀鍏冩暟鎹 - * @property {String} type 绫诲瀷 - * @property {Function} request 璇锋眰 - * @property {String} label 鏍囩瀛楁 - * @property {String} value 鍊煎瓧娈 - */ -export default class DictMeta { - constructor(options) { - this.type = options.type - this.request = options.request - this.responseConverter = options.responseConverter - this.labelField = options.labelField - this.valueField = options.valueField - this.lazy = options.lazy === true - } -} - - -/** - * 瑙f瀽瀛楀吀鍏冩暟鎹 - * @param {Object} options - * @returns {DictMeta} - */ -DictMeta.parse= function(options) { - let opts = null - if (typeof options === 'string') { - opts = DictOptions.metas[options] || {} - opts.type = options - } else if (typeof options === 'object') { - opts = options - } - opts = mergeRecursive(DictOptions.metas['*'], opts) - return new DictMeta(opts) -} diff --git a/ruoyi-ui/src/utils/dict/DictOptions.js b/ruoyi-ui/src/utils/dict/DictOptions.js deleted file mode 100644 index 338a94e..0000000 --- a/ruoyi-ui/src/utils/dict/DictOptions.js +++ /dev/null @@ -1,51 +0,0 @@ -import { mergeRecursive } from "@/utils/ruoyi"; -import dictConverter from './DictConverter' - -export const options = { - metas: { - '*': { - /** - * 瀛楀吀璇锋眰锛屾柟娉曠鍚嶄负function(dictMeta: DictMeta): Promise - */ - request: (dictMeta) => { - console.log(`load dict ${dictMeta.type}`) - return Promise.resolve([]) - }, - /** - * 瀛楀吀鍝嶅簲鏁版嵁杞崲鍣紝鏂规硶绛惧悕涓篺unction(response: Object, dictMeta: DictMeta): DictData - */ - responseConverter, - labelField: 'label', - valueField: 'value', - }, - }, - /** - * 榛樿鏍囩瀛楁 - */ - DEFAULT_LABEL_FIELDS: ['label', 'name', 'title'], - /** - * 榛樿鍊煎瓧娈 - */ - DEFAULT_VALUE_FIELDS: ['value', 'id', 'uid', 'key'], -} - -/** - * 鏄犲皠瀛楀吀 - * @param {Object} response 瀛楀吀鏁版嵁 - * @param {DictMeta} dictMeta 瀛楀吀鍏冩暟鎹 - * @returns {DictData} - */ -function responseConverter(response, dictMeta) { - const dicts = response.content instanceof Array ? response.content : response - if (dicts === undefined) { - console.warn(`no dict data of "${dictMeta.type}" found in the response`) - return [] - } - return dicts.map(d => dictConverter(d, dictMeta)) -} - -export function mergeOptions(src) { - mergeRecursive(options, src) -} - -export default options diff --git a/ruoyi-ui/src/utils/dict/index.js b/ruoyi-ui/src/utils/dict/index.js deleted file mode 100644 index 215eb9e..0000000 --- a/ruoyi-ui/src/utils/dict/index.js +++ /dev/null @@ -1,33 +0,0 @@ -import Dict from './Dict' -import { mergeOptions } from './DictOptions' - -export default function(Vue, options) { - mergeOptions(options) - Vue.mixin({ - data() { - if (this.$options === undefined || this.$options.dicts === undefined || this.$options.dicts === null) { - return {} - } - const dict = new Dict() - dict.owner = this - return { - dict - } - }, - created() { - if (!(this.dict instanceof Dict)) { - return - } - options.onCreated && options.onCreated(this.dict) - this.dict.init(this.$options.dicts).then(() => { - options.onReady && options.onReady(this.dict) - this.$nextTick(() => { - this.$emit('dictReady', this.dict) - if (this.$options.methods && this.$options.methods.onDictReady instanceof Function) { - this.$options.methods.onDictReady.call(this, this.dict) - } - }) - }) - }, - }) -} diff --git a/ruoyi-ui/src/utils/errorCode.js b/ruoyi-ui/src/utils/errorCode.js deleted file mode 100644 index d2111ee..0000000 --- a/ruoyi-ui/src/utils/errorCode.js +++ /dev/null @@ -1,6 +0,0 @@ -export default { - '401': '璁よ瘉澶辫触锛屾棤娉曡闂郴缁熻祫婧', - '403': '褰撳墠鎿嶄綔娌℃湁鏉冮檺', - '404': '璁块棶璧勬簮涓嶅瓨鍦', - 'default': '绯荤粺鏈煡閿欒锛岃鍙嶉缁欑鐞嗗憳' -} diff --git a/ruoyi-ui/src/utils/generator/config.js b/ruoyi-ui/src/utils/generator/config.js deleted file mode 100644 index 7abf227..0000000 --- a/ruoyi-ui/src/utils/generator/config.js +++ /dev/null @@ -1,438 +0,0 @@ -export const formConf = { - formRef: 'elForm', - formModel: 'formData', - size: 'medium', - labelPosition: 'right', - labelWidth: 100, - formRules: 'rules', - gutter: 15, - disabled: false, - span: 24, - formBtns: true -} - -export const inputComponents = [ - { - label: '鍗曡鏂囨湰', - tag: 'el-input', - tagIcon: 'input', - placeholder: '璇疯緭鍏', - defaultValue: undefined, - span: 24, - labelWidth: null, - style: { width: '100%' }, - clearable: true, - prepend: '', - append: '', - 'prefix-icon': '', - 'suffix-icon': '', - maxlength: null, - 'show-word-limit': false, - readonly: false, - disabled: false, - required: true, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/input' - }, - { - label: '澶氳鏂囨湰', - tag: 'el-input', - tagIcon: 'textarea', - type: 'textarea', - placeholder: '璇疯緭鍏', - defaultValue: undefined, - span: 24, - labelWidth: null, - autosize: { - minRows: 4, - maxRows: 4 - }, - style: { width: '100%' }, - maxlength: null, - 'show-word-limit': false, - readonly: false, - disabled: false, - required: true, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/input' - }, - { - label: '瀵嗙爜', - tag: 'el-input', - tagIcon: 'password', - placeholder: '璇疯緭鍏', - defaultValue: undefined, - span: 24, - 'show-password': true, - labelWidth: null, - style: { width: '100%' }, - clearable: true, - prepend: '', - append: '', - 'prefix-icon': '', - 'suffix-icon': '', - maxlength: null, - 'show-word-limit': false, - readonly: false, - disabled: false, - required: true, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/input' - }, - { - label: '璁℃暟鍣', - tag: 'el-input-number', - tagIcon: 'number', - placeholder: '', - defaultValue: undefined, - span: 24, - labelWidth: null, - min: undefined, - max: undefined, - step: undefined, - 'step-strictly': false, - precision: undefined, - 'controls-position': '', - disabled: false, - required: true, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/input-number' - } -] - -export const selectComponents = [ - { - label: '涓嬫媺閫夋嫨', - tag: 'el-select', - tagIcon: 'select', - placeholder: '璇烽夋嫨', - defaultValue: undefined, - span: 24, - labelWidth: null, - style: { width: '100%' }, - clearable: true, - disabled: false, - required: true, - filterable: false, - multiple: false, - options: [{ - label: '閫夐」涓', - value: 1 - }, { - label: '閫夐」浜', - value: 2 - }], - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/select' - }, - { - label: '绾ц仈閫夋嫨', - tag: 'el-cascader', - tagIcon: 'cascader', - placeholder: '璇烽夋嫨', - defaultValue: [], - span: 24, - labelWidth: null, - style: { width: '100%' }, - props: { - props: { - multiple: false - } - }, - 'show-all-levels': true, - disabled: false, - clearable: true, - filterable: false, - required: true, - options: [{ - id: 1, - value: 1, - label: '閫夐」1', - children: [{ - id: 2, - value: 2, - label: '閫夐」1-1' - }] - }], - dataType: 'dynamic', - labelKey: 'label', - valueKey: 'value', - childrenKey: 'children', - separator: '/', - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/cascader' - }, - { - label: '鍗曢夋缁', - tag: 'el-radio-group', - tagIcon: 'radio', - defaultValue: undefined, - span: 24, - labelWidth: null, - style: {}, - optionType: 'default', - border: false, - size: 'medium', - disabled: false, - required: true, - options: [{ - label: '閫夐」涓', - value: 1 - }, { - label: '閫夐」浜', - value: 2 - }], - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/radio' - }, - { - label: '澶氶夋缁', - tag: 'el-checkbox-group', - tagIcon: 'checkbox', - defaultValue: [], - span: 24, - labelWidth: null, - style: {}, - optionType: 'default', - border: false, - size: 'medium', - disabled: false, - required: true, - options: [{ - label: '閫夐」涓', - value: 1 - }, { - label: '閫夐」浜', - value: 2 - }], - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/checkbox' - }, - { - label: '寮鍏', - tag: 'el-switch', - tagIcon: 'switch', - defaultValue: false, - span: 24, - labelWidth: null, - style: {}, - disabled: false, - required: true, - 'active-text': '', - 'inactive-text': '', - 'active-color': null, - 'inactive-color': null, - 'active-value': true, - 'inactive-value': false, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/switch' - }, - { - label: '婊戝潡', - tag: 'el-slider', - tagIcon: 'slider', - defaultValue: null, - span: 24, - labelWidth: null, - disabled: false, - required: true, - min: 0, - max: 100, - step: 1, - 'show-stops': false, - range: false, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/slider' - }, - { - label: '鏃堕棿閫夋嫨', - tag: 'el-time-picker', - tagIcon: 'time', - placeholder: '璇烽夋嫨', - defaultValue: null, - span: 24, - labelWidth: null, - style: { width: '100%' }, - disabled: false, - clearable: true, - required: true, - 'picker-options': { - selectableRange: '00:00:00-23:59:59' - }, - format: 'HH:mm:ss', - 'value-format': 'HH:mm:ss', - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/time-picker' - }, - { - label: '鏃堕棿鑼冨洿', - tag: 'el-time-picker', - tagIcon: 'time-range', - defaultValue: null, - span: 24, - labelWidth: null, - style: { width: '100%' }, - disabled: false, - clearable: true, - required: true, - 'is-range': true, - 'range-separator': '鑷', - 'start-placeholder': '寮濮嬫椂闂', - 'end-placeholder': '缁撴潫鏃堕棿', - format: 'HH:mm:ss', - 'value-format': 'HH:mm:ss', - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/time-picker' - }, - { - label: '鏃ユ湡閫夋嫨', - tag: 'el-date-picker', - tagIcon: 'date', - placeholder: '璇烽夋嫨', - defaultValue: null, - type: 'date', - span: 24, - labelWidth: null, - style: { width: '100%' }, - disabled: false, - clearable: true, - required: true, - format: 'yyyy-MM-dd', - 'value-format': 'yyyy-MM-dd', - readonly: false, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/date-picker' - }, - { - label: '鏃ユ湡鑼冨洿', - tag: 'el-date-picker', - tagIcon: 'date-range', - defaultValue: null, - span: 24, - labelWidth: null, - style: { width: '100%' }, - type: 'daterange', - 'range-separator': '鑷', - 'start-placeholder': '寮濮嬫棩鏈', - 'end-placeholder': '缁撴潫鏃ユ湡', - disabled: false, - clearable: true, - required: true, - format: 'yyyy-MM-dd', - 'value-format': 'yyyy-MM-dd', - readonly: false, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/date-picker' - }, - { - label: '璇勫垎', - tag: 'el-rate', - tagIcon: 'rate', - defaultValue: 0, - span: 24, - labelWidth: null, - style: {}, - max: 5, - 'allow-half': false, - 'show-text': false, - 'show-score': false, - disabled: false, - required: true, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/rate' - }, - { - label: '棰滆壊閫夋嫨', - tag: 'el-color-picker', - tagIcon: 'color', - defaultValue: null, - labelWidth: null, - 'show-alpha': false, - 'color-format': '', - disabled: false, - required: true, - size: 'medium', - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/color-picker' - }, - { - label: '涓婁紶', - tag: 'el-upload', - tagIcon: 'upload', - action: 'https://jsonplaceholder.typicode.com/posts/', - defaultValue: null, - labelWidth: null, - disabled: false, - required: true, - accept: '', - name: 'file', - 'auto-upload': true, - showTip: false, - buttonText: '鐐瑰嚮涓婁紶', - fileSize: 2, - sizeUnit: 'MB', - 'list-type': 'text', - multiple: false, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/upload' - } -] - -export const layoutComponents = [ - { - layout: 'rowFormItem', - tagIcon: 'row', - type: 'default', - justify: 'start', - align: 'top', - label: '琛屽鍣', - layoutTree: true, - children: [], - document: 'https://element.eleme.cn/#/zh-CN/component/layout' - }, - { - layout: 'colFormItem', - label: '鎸夐挳', - changeTag: true, - labelWidth: null, - tag: 'el-button', - tagIcon: 'button', - span: 24, - default: '涓昏鎸夐挳', - type: 'primary', - icon: 'el-icon-search', - size: 'medium', - disabled: false, - document: 'https://element.eleme.cn/#/zh-CN/component/button' - } -] - -// 缁勪欢rule鐨勮Е鍙戞柟寮忥紝鏃犺Е鍙戞柟寮忕殑缁勪欢涓嶇敓鎴恟ule -export const trigger = { - 'el-input': 'blur', - 'el-input-number': 'blur', - 'el-select': 'change', - 'el-radio-group': 'change', - 'el-checkbox-group': 'change', - 'el-cascader': 'change', - 'el-time-picker': 'change', - 'el-date-picker': 'change', - 'el-rate': 'change' -} diff --git a/ruoyi-ui/src/utils/generator/css.js b/ruoyi-ui/src/utils/generator/css.js deleted file mode 100644 index c1c62e6..0000000 --- a/ruoyi-ui/src/utils/generator/css.js +++ /dev/null @@ -1,18 +0,0 @@ -const styles = { - 'el-rate': '.el-rate{display: inline-block; vertical-align: text-top;}', - 'el-upload': '.el-upload__tip{line-height: 1.2;}' -} - -function addCss(cssList, el) { - const css = styles[el.tag] - css && cssList.indexOf(css) === -1 && cssList.push(css) - if (el.children) { - el.children.forEach(el2 => addCss(cssList, el2)) - } -} - -export function makeUpCss(conf) { - const cssList = [] - conf.fields.forEach(el => addCss(cssList, el)) - return cssList.join('\n') -} diff --git a/ruoyi-ui/src/utils/generator/drawingDefault.js b/ruoyi-ui/src/utils/generator/drawingDefault.js deleted file mode 100644 index 09f133c..0000000 --- a/ruoyi-ui/src/utils/generator/drawingDefault.js +++ /dev/null @@ -1,29 +0,0 @@ -export default [ - { - layout: 'colFormItem', - tagIcon: 'input', - label: '鎵嬫満鍙', - vModel: 'mobile', - formId: 6, - tag: 'el-input', - placeholder: '璇疯緭鍏ユ墜鏈哄彿', - defaultValue: '', - span: 24, - style: { width: '100%' }, - clearable: true, - prepend: '', - append: '', - 'prefix-icon': 'el-icon-mobile', - 'suffix-icon': '', - maxlength: 11, - 'show-word-limit': true, - readonly: false, - disabled: false, - required: true, - changeTag: true, - regList: [{ - pattern: '/^1(3|4|5|7|8|9)\\d{9}$/', - message: '鎵嬫満鍙锋牸寮忛敊璇' - }] - } -] diff --git a/ruoyi-ui/src/utils/generator/html.js b/ruoyi-ui/src/utils/generator/html.js deleted file mode 100644 index 9bcc536..0000000 --- a/ruoyi-ui/src/utils/generator/html.js +++ /dev/null @@ -1,359 +0,0 @@ -/* eslint-disable max-len */ -import { trigger } from './config' - -let confGlobal -let someSpanIsNot24 - -export function dialogWrapper(str) { - return ` - ${str} -
- 鍙栨秷 - 纭畾 -
-
` -} - -export function vueTemplate(str) { - return `` -} - -export function vueScript(str) { - return `` -} - -export function cssStyle(cssStr) { - return `` -} - -function buildFormTemplate(conf, child, type) { - let labelPosition = '' - if (conf.labelPosition !== 'right') { - labelPosition = `label-position="${conf.labelPosition}"` - } - const disabled = conf.disabled ? `:disabled="${conf.disabled}"` : '' - let str = ` - ${child} - ${buildFromBtns(conf, type)} - ` - if (someSpanIsNot24) { - str = ` - ${str} - ` - } - return str -} - -function buildFromBtns(conf, type) { - let str = '' - if (conf.formBtns && type === 'file') { - str = ` - 鎻愪氦 - 閲嶇疆 - ` - if (someSpanIsNot24) { - str = ` - ${str} - ` - } - } - return str -} - -// span涓嶄负24鐨勭敤el-col鍖呰9 -function colWrapper(element, str) { - if (someSpanIsNot24 || element.span !== 24) { - return ` - ${str} - ` - } - return str -} - -const layouts = { - colFormItem(element) { - let labelWidth = '' - if (element.labelWidth && element.labelWidth !== confGlobal.labelWidth) { - labelWidth = `label-width="${element.labelWidth}px"` - } - const required = !trigger[element.tag] && element.required ? 'required' : '' - const tagDom = tags[element.tag] ? tags[element.tag](element) : null - let str = ` - ${tagDom} - ` - str = colWrapper(element, str) - return str - }, - rowFormItem(element) { - const type = element.type === 'default' ? '' : `type="${element.type}"` - const justify = element.type === 'default' ? '' : `justify="${element.justify}"` - const align = element.type === 'default' ? '' : `align="${element.align}"` - const gutter = element.gutter ? `gutter="${element.gutter}"` : '' - const children = element.children.map(el => layouts[el.layout](el)) - let str = ` - ${children.join('\n')} - ` - str = colWrapper(element, str) - return str - } -} - -const tags = { - 'el-button': el => { - const { - tag, disabled - } = attrBuilder(el) - const type = el.type ? `type="${el.type}"` : '' - const icon = el.icon ? `icon="${el.icon}"` : '' - const size = el.size ? `size="${el.size}"` : '' - let child = buildElButtonChild(el) - - if (child) child = `\n${child}\n` // 鎹㈣ - return `<${el.tag} ${type} ${icon} ${size} ${disabled}>${child}` - }, - 'el-input': el => { - const { - disabled, vModel, clearable, placeholder, width - } = attrBuilder(el) - const maxlength = el.maxlength ? `:maxlength="${el.maxlength}"` : '' - const showWordLimit = el['show-word-limit'] ? 'show-word-limit' : '' - const readonly = el.readonly ? 'readonly' : '' - const prefixIcon = el['prefix-icon'] ? `prefix-icon='${el['prefix-icon']}'` : '' - const suffixIcon = el['suffix-icon'] ? `suffix-icon='${el['suffix-icon']}'` : '' - const showPassword = el['show-password'] ? 'show-password' : '' - const type = el.type ? `type="${el.type}"` : '' - const autosize = el.autosize && el.autosize.minRows - ? `:autosize="{minRows: ${el.autosize.minRows}, maxRows: ${el.autosize.maxRows}}"` - : '' - let child = buildElInputChild(el) - - if (child) child = `\n${child}\n` // 鎹㈣ - return `<${el.tag} ${vModel} ${type} ${placeholder} ${maxlength} ${showWordLimit} ${readonly} ${disabled} ${clearable} ${prefixIcon} ${suffixIcon} ${showPassword} ${autosize} ${width}>${child}` - }, - 'el-input-number': el => { - const { disabled, vModel, placeholder } = attrBuilder(el) - const controlsPosition = el['controls-position'] ? `controls-position=${el['controls-position']}` : '' - const min = el.min ? `:min='${el.min}'` : '' - const max = el.max ? `:max='${el.max}'` : '' - const step = el.step ? `:step='${el.step}'` : '' - const stepStrictly = el['step-strictly'] ? 'step-strictly' : '' - const precision = el.precision ? `:precision='${el.precision}'` : '' - - return `<${el.tag} ${vModel} ${placeholder} ${step} ${stepStrictly} ${precision} ${controlsPosition} ${min} ${max} ${disabled}>` - }, - 'el-select': el => { - const { - disabled, vModel, clearable, placeholder, width - } = attrBuilder(el) - const filterable = el.filterable ? 'filterable' : '' - const multiple = el.multiple ? 'multiple' : '' - let child = buildElSelectChild(el) - - if (child) child = `\n${child}\n` // 鎹㈣ - return `<${el.tag} ${vModel} ${placeholder} ${disabled} ${multiple} ${filterable} ${clearable} ${width}>${child}` - }, - 'el-radio-group': el => { - const { disabled, vModel } = attrBuilder(el) - const size = `size="${el.size}"` - let child = buildElRadioGroupChild(el) - - if (child) child = `\n${child}\n` // 鎹㈣ - return `<${el.tag} ${vModel} ${size} ${disabled}>${child}` - }, - 'el-checkbox-group': el => { - const { disabled, vModel } = attrBuilder(el) - const size = `size="${el.size}"` - const min = el.min ? `:min="${el.min}"` : '' - const max = el.max ? `:max="${el.max}"` : '' - let child = buildElCheckboxGroupChild(el) - - if (child) child = `\n${child}\n` // 鎹㈣ - return `<${el.tag} ${vModel} ${min} ${max} ${size} ${disabled}>${child}` - }, - 'el-switch': el => { - const { disabled, vModel } = attrBuilder(el) - const activeText = el['active-text'] ? `active-text="${el['active-text']}"` : '' - const inactiveText = el['inactive-text'] ? `inactive-text="${el['inactive-text']}"` : '' - const activeColor = el['active-color'] ? `active-color="${el['active-color']}"` : '' - const inactiveColor = el['inactive-color'] ? `inactive-color="${el['inactive-color']}"` : '' - const activeValue = el['active-value'] !== true ? `:active-value='${JSON.stringify(el['active-value'])}'` : '' - const inactiveValue = el['inactive-value'] !== false ? `:inactive-value='${JSON.stringify(el['inactive-value'])}'` : '' - - return `<${el.tag} ${vModel} ${activeText} ${inactiveText} ${activeColor} ${inactiveColor} ${activeValue} ${inactiveValue} ${disabled}>` - }, - 'el-cascader': el => { - const { - disabled, vModel, clearable, placeholder, width - } = attrBuilder(el) - const options = el.options ? `:options="${el.vModel}Options"` : '' - const props = el.props ? `:props="${el.vModel}Props"` : '' - const showAllLevels = el['show-all-levels'] ? '' : ':show-all-levels="false"' - const filterable = el.filterable ? 'filterable' : '' - const separator = el.separator === '/' ? '' : `separator="${el.separator}"` - - return `<${el.tag} ${vModel} ${options} ${props} ${width} ${showAllLevels} ${placeholder} ${separator} ${filterable} ${clearable} ${disabled}>` - }, - 'el-slider': el => { - const { disabled, vModel } = attrBuilder(el) - const min = el.min ? `:min='${el.min}'` : '' - const max = el.max ? `:max='${el.max}'` : '' - const step = el.step ? `:step='${el.step}'` : '' - const range = el.range ? 'range' : '' - const showStops = el['show-stops'] ? `:show-stops="${el['show-stops']}"` : '' - - return `<${el.tag} ${min} ${max} ${step} ${vModel} ${range} ${showStops} ${disabled}>` - }, - 'el-time-picker': el => { - const { - disabled, vModel, clearable, placeholder, width - } = attrBuilder(el) - const startPlaceholder = el['start-placeholder'] ? `start-placeholder="${el['start-placeholder']}"` : '' - const endPlaceholder = el['end-placeholder'] ? `end-placeholder="${el['end-placeholder']}"` : '' - const rangeSeparator = el['range-separator'] ? `range-separator="${el['range-separator']}"` : '' - const isRange = el['is-range'] ? 'is-range' : '' - const format = el.format ? `format="${el.format}"` : '' - const valueFormat = el['value-format'] ? `value-format="${el['value-format']}"` : '' - const pickerOptions = el['picker-options'] ? `:picker-options='${JSON.stringify(el['picker-options'])}'` : '' - - return `<${el.tag} ${vModel} ${isRange} ${format} ${valueFormat} ${pickerOptions} ${width} ${placeholder} ${startPlaceholder} ${endPlaceholder} ${rangeSeparator} ${clearable} ${disabled}>` - }, - 'el-date-picker': el => { - const { - disabled, vModel, clearable, placeholder, width - } = attrBuilder(el) - const startPlaceholder = el['start-placeholder'] ? `start-placeholder="${el['start-placeholder']}"` : '' - const endPlaceholder = el['end-placeholder'] ? `end-placeholder="${el['end-placeholder']}"` : '' - const rangeSeparator = el['range-separator'] ? `range-separator="${el['range-separator']}"` : '' - const format = el.format ? `format="${el.format}"` : '' - const valueFormat = el['value-format'] ? `value-format="${el['value-format']}"` : '' - const type = el.type === 'date' ? '' : `type="${el.type}"` - const readonly = el.readonly ? 'readonly' : '' - - return `<${el.tag} ${type} ${vModel} ${format} ${valueFormat} ${width} ${placeholder} ${startPlaceholder} ${endPlaceholder} ${rangeSeparator} ${clearable} ${readonly} ${disabled}>` - }, - 'el-rate': el => { - const { disabled, vModel } = attrBuilder(el) - const max = el.max ? `:max='${el.max}'` : '' - const allowHalf = el['allow-half'] ? 'allow-half' : '' - const showText = el['show-text'] ? 'show-text' : '' - const showScore = el['show-score'] ? 'show-score' : '' - - return `<${el.tag} ${vModel} ${allowHalf} ${showText} ${showScore} ${disabled}>` - }, - 'el-color-picker': el => { - const { disabled, vModel } = attrBuilder(el) - const size = `size="${el.size}"` - const showAlpha = el['show-alpha'] ? 'show-alpha' : '' - const colorFormat = el['color-format'] ? `color-format="${el['color-format']}"` : '' - - return `<${el.tag} ${vModel} ${size} ${showAlpha} ${colorFormat} ${disabled}>` - }, - 'el-upload': el => { - const disabled = el.disabled ? ':disabled=\'true\'' : '' - const action = el.action ? `:action="${el.vModel}Action"` : '' - const multiple = el.multiple ? 'multiple' : '' - const listType = el['list-type'] !== 'text' ? `list-type="${el['list-type']}"` : '' - const accept = el.accept ? `accept="${el.accept}"` : '' - const name = el.name !== 'file' ? `name="${el.name}"` : '' - const autoUpload = el['auto-upload'] === false ? ':auto-upload="false"' : '' - const beforeUpload = `:before-upload="${el.vModel}BeforeUpload"` - const fileList = `:file-list="${el.vModel}fileList"` - const ref = `ref="${el.vModel}"` - let child = buildElUploadChild(el) - - if (child) child = `\n${child}\n` // 鎹㈣ - return `<${el.tag} ${ref} ${fileList} ${action} ${autoUpload} ${multiple} ${beforeUpload} ${listType} ${accept} ${name} ${disabled}>${child}` - } -} - -function attrBuilder(el) { - return { - vModel: `v-model="${confGlobal.formModel}.${el.vModel}"`, - clearable: el.clearable ? 'clearable' : '', - placeholder: el.placeholder ? `placeholder="${el.placeholder}"` : '', - width: el.style && el.style.width ? ':style="{width: \'100%\'}"' : '', - disabled: el.disabled ? ':disabled=\'true\'' : '' - } -} - -// el-buttin 瀛愮骇 -function buildElButtonChild(conf) { - const children = [] - if (conf.default) { - children.push(conf.default) - } - return children.join('\n') -} - -// el-input innerHTML -function buildElInputChild(conf) { - const children = [] - if (conf.prepend) { - children.push(``) - } - if (conf.append) { - children.push(``) - } - return children.join('\n') -} - -function buildElSelectChild(conf) { - const children = [] - if (conf.options && conf.options.length) { - children.push(``) - } - return children.join('\n') -} - -function buildElRadioGroupChild(conf) { - const children = [] - if (conf.options && conf.options.length) { - const tag = conf.optionType === 'button' ? 'el-radio-button' : 'el-radio' - const border = conf.border ? 'border' : '' - children.push(`<${tag} v-for="(item, index) in ${conf.vModel}Options" :key="index" :label="item.value" :disabled="item.disabled" ${border}>{{item.label}}`) - } - return children.join('\n') -} - -function buildElCheckboxGroupChild(conf) { - const children = [] - if (conf.options && conf.options.length) { - const tag = conf.optionType === 'button' ? 'el-checkbox-button' : 'el-checkbox' - const border = conf.border ? 'border' : '' - children.push(`<${tag} v-for="(item, index) in ${conf.vModel}Options" :key="index" :label="item.value" :disabled="item.disabled" ${border}>{{item.label}}`) - } - return children.join('\n') -} - -function buildElUploadChild(conf) { - const list = [] - if (conf['list-type'] === 'picture-card') list.push('') - else list.push(`${conf.buttonText}`) - if (conf.showTip) list.push(`
鍙兘涓婁紶涓嶈秴杩 ${conf.fileSize}${conf.sizeUnit} 鐨${conf.accept}鏂囦欢
`) - return list.join('\n') -} - -export function makeUpHtml(conf, type) { - const htmlList = [] - confGlobal = conf - someSpanIsNot24 = conf.fields.some(item => item.span !== 24) - conf.fields.forEach(el => { - htmlList.push(layouts[el.layout](el)) - }) - const htmlStr = htmlList.join('\n') - - let temp = buildFormTemplate(conf, htmlStr, type) - if (type === 'dialog') { - temp = dialogWrapper(temp) - } - confGlobal = null - return temp -} diff --git a/ruoyi-ui/src/utils/generator/icon.json b/ruoyi-ui/src/utils/generator/icon.json deleted file mode 100644 index 2d9999a..0000000 --- a/ruoyi-ui/src/utils/generator/icon.json +++ /dev/null @@ -1 +0,0 @@ -["platform-eleme","eleme","delete-solid","delete","s-tools","setting","user-solid","user","phone","phone-outline","more","more-outline","star-on","star-off","s-goods","goods","warning","warning-outline","question","info","remove","circle-plus","success","error","zoom-in","zoom-out","remove-outline","circle-plus-outline","circle-check","circle-close","s-help","help","minus","plus","check","close","picture","picture-outline","picture-outline-round","upload","upload2","download","camera-solid","camera","video-camera-solid","video-camera","message-solid","bell","s-cooperation","s-order","s-platform","s-fold","s-unfold","s-operation","s-promotion","s-home","s-release","s-ticket","s-management","s-open","s-shop","s-marketing","s-flag","s-comment","s-finance","s-claim","s-custom","s-opportunity","s-data","s-check","s-grid","menu","share","d-caret","caret-left","caret-right","caret-bottom","caret-top","bottom-left","bottom-right","back","right","bottom","top","top-left","top-right","arrow-left","arrow-right","arrow-down","arrow-up","d-arrow-left","d-arrow-right","video-pause","video-play","refresh","refresh-right","refresh-left","finished","sort","sort-up","sort-down","rank","loading","view","c-scale-to-original","date","edit","edit-outline","folder","folder-opened","folder-add","folder-remove","folder-delete","folder-checked","tickets","document-remove","document-delete","document-copy","document-checked","document","document-add","printer","paperclip","takeaway-box","search","monitor","attract","mobile","scissors","umbrella","headset","brush","mouse","coordinate","magic-stick","reading","data-line","data-board","pie-chart","data-analysis","collection-tag","film","suitcase","suitcase-1","receiving","collection","files","notebook-1","notebook-2","toilet-paper","office-building","school","table-lamp","house","no-smoking","smoking","shopping-cart-full","shopping-cart-1","shopping-cart-2","shopping-bag-1","shopping-bag-2","sold-out","sell","present","box","bank-card","money","coin","wallet","discount","price-tag","news","guide","male","female","thumb","cpu","link","connection","open","turn-off","set-up","chat-round","chat-line-round","chat-square","chat-dot-round","chat-dot-square","chat-line-square","message","postcard","position","turn-off-microphone","microphone","close-notification","bangzhu","time","odometer","crop","aim","switch-button","full-screen","copy-document","mic","stopwatch","medal-1","medal","trophy","trophy-1","first-aid-kit","discover","place","location","location-outline","location-information","add-location","delete-location","map-location","alarm-clock","timer","watch-1","watch","lock","unlock","key","service","mobile-phone","bicycle","truck","ship","basketball","football","soccer","baseball","wind-power","light-rain","lightning","heavy-rain","sunrise","sunrise-1","sunset","sunny","cloudy","partly-cloudy","cloudy-and-sunny","moon","moon-night","dish","dish-1","food","chicken","fork-spoon","knife-fork","burger","tableware","sugar","dessert","ice-cream","hot-water","water-cup","coffee-cup","cold-drink","goblet","goblet-full","goblet-square","goblet-square-full","refrigerator","grape","watermelon","cherry","apple","pear","orange","coffee","ice-tea","ice-drink","milk-tea","potato-strips","lollipop","ice-cream-square","ice-cream-round"] \ No newline at end of file diff --git a/ruoyi-ui/src/utils/generator/js.js b/ruoyi-ui/src/utils/generator/js.js deleted file mode 100644 index ee8668d..0000000 --- a/ruoyi-ui/src/utils/generator/js.js +++ /dev/null @@ -1,235 +0,0 @@ -import { exportDefault, titleCase } from '@/utils/index' -import { trigger } from './config' - -const units = { - KB: '1024', - MB: '1024 / 1024', - GB: '1024 / 1024 / 1024' -} -let confGlobal -const inheritAttrs = { - file: '', - dialog: 'inheritAttrs: false,' -} - - -export function makeUpJs(conf, type) { - confGlobal = conf = JSON.parse(JSON.stringify(conf)) - const dataList = [] - const ruleList = [] - const optionsList = [] - const propsList = [] - const methodList = mixinMethod(type) - const uploadVarList = [] - - conf.fields.forEach(el => { - buildAttributes(el, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) - }) - - const script = buildexport( - conf, - type, - dataList.join('\n'), - ruleList.join('\n'), - optionsList.join('\n'), - uploadVarList.join('\n'), - propsList.join('\n'), - methodList.join('\n') - ) - confGlobal = null - return script -} - -function buildAttributes(el, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) { - buildData(el, dataList) - buildRules(el, ruleList) - - if (el.options && el.options.length) { - buildOptions(el, optionsList) - if (el.dataType === 'dynamic') { - const model = `${el.vModel}Options` - const options = titleCase(model) - buildOptionMethod(`get${options}`, model, methodList) - } - } - - if (el.props && el.props.props) { - buildProps(el, propsList) - } - - if (el.action && el.tag === 'el-upload') { - uploadVarList.push( - `${el.vModel}Action: '${el.action}', - ${el.vModel}fileList: [],` - ) - methodList.push(buildBeforeUpload(el)) - if (!el['auto-upload']) { - methodList.push(buildSubmitUpload(el)) - } - } - - if (el.children) { - el.children.forEach(el2 => { - buildAttributes(el2, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) - }) - } -} - -function mixinMethod(type) { - const list = []; const - minxins = { - file: confGlobal.formBtns ? { - submitForm: `submitForm() { - this.$refs['${confGlobal.formRef}'].validate(valid => { - if(!valid) return - // TODO 鎻愪氦琛ㄥ崟 - }) - },`, - resetForm: `resetForm() { - this.$refs['${confGlobal.formRef}'].resetFields() - },` - } : null, - dialog: { - onOpen: 'onOpen() {},', - onClose: `onClose() { - this.$refs['${confGlobal.formRef}'].resetFields() - },`, - close: `close() { - this.$emit('update:visible', false) - },`, - handleConfirm: `handleConfirm() { - this.$refs['${confGlobal.formRef}'].validate(valid => { - if(!valid) return - this.close() - }) - },` - } - } - - const methods = minxins[type] - if (methods) { - Object.keys(methods).forEach(key => { - list.push(methods[key]) - }) - } - - return list -} - -function buildData(conf, dataList) { - if (conf.vModel === undefined) return - let defaultValue - if (typeof (conf.defaultValue) === 'string' && !conf.multiple) { - defaultValue = `'${conf.defaultValue}'` - } else { - defaultValue = `${JSON.stringify(conf.defaultValue)}` - } - dataList.push(`${conf.vModel}: ${defaultValue},`) -} - -function buildRules(conf, ruleList) { - if (conf.vModel === undefined) return - const rules = [] - if (trigger[conf.tag]) { - if (conf.required) { - const type = Array.isArray(conf.defaultValue) ? 'type: \'array\',' : '' - let message = Array.isArray(conf.defaultValue) ? `璇疯嚦灏戦夋嫨涓涓${conf.vModel}` : conf.placeholder - if (message === undefined) message = `${conf.label}涓嶈兘涓虹┖` - rules.push(`{ required: true, ${type} message: '${message}', trigger: '${trigger[conf.tag]}' }`) - } - if (conf.regList && Array.isArray(conf.regList)) { - conf.regList.forEach(item => { - if (item.pattern) { - rules.push(`{ pattern: ${eval(item.pattern)}, message: '${item.message}', trigger: '${trigger[conf.tag]}' }`) - } - }) - } - ruleList.push(`${conf.vModel}: [${rules.join(',')}],`) - } -} - -function buildOptions(conf, optionsList) { - if (conf.vModel === undefined) return - if (conf.dataType === 'dynamic') { conf.options = [] } - const str = `${conf.vModel}Options: ${JSON.stringify(conf.options)},` - optionsList.push(str) -} - -function buildProps(conf, propsList) { - if (conf.dataType === 'dynamic') { - conf.valueKey !== 'value' && (conf.props.props.value = conf.valueKey) - conf.labelKey !== 'label' && (conf.props.props.label = conf.labelKey) - conf.childrenKey !== 'children' && (conf.props.props.children = conf.childrenKey) - } - const str = `${conf.vModel}Props: ${JSON.stringify(conf.props.props)},` - propsList.push(str) -} - -function buildBeforeUpload(conf) { - const unitNum = units[conf.sizeUnit]; let rightSizeCode = ''; let acceptCode = ''; const - returnList = [] - if (conf.fileSize) { - rightSizeCode = `let isRightSize = file.size / ${unitNum} < ${conf.fileSize} - if(!isRightSize){ - this.$message.error('鏂囦欢澶у皬瓒呰繃 ${conf.fileSize}${conf.sizeUnit}') - }` - returnList.push('isRightSize') - } - if (conf.accept) { - acceptCode = `let isAccept = new RegExp('${conf.accept}').test(file.type) - if(!isAccept){ - this.$message.error('搴旇閫夋嫨${conf.accept}绫诲瀷鐨勬枃浠') - }` - returnList.push('isAccept') - } - const str = `${conf.vModel}BeforeUpload(file) { - ${rightSizeCode} - ${acceptCode} - return ${returnList.join('&&')} - },` - return returnList.length ? str : '' -} - -function buildSubmitUpload(conf) { - const str = `submitUpload() { - this.$refs['${conf.vModel}'].submit() - },` - return str -} - -function buildOptionMethod(methodName, model, methodList) { - const str = `${methodName}() { - // TODO 鍙戣捣璇锋眰鑾峰彇鏁版嵁 - this.${model} - },` - methodList.push(str) -} - -function buildexport(conf, type, data, rules, selectOptions, uploadVar, props, methods) { - const str = `${exportDefault}{ - ${inheritAttrs[type]} - components: {}, - props: [], - data () { - return { - ${conf.formModel}: { - ${data} - }, - ${conf.formRules}: { - ${rules} - }, - ${uploadVar} - ${selectOptions} - ${props} - } - }, - computed: {}, - watch: {}, - created () {}, - mounted () {}, - methods: { - ${methods} - } -}` - return str -} diff --git a/ruoyi-ui/src/utils/generator/render.js b/ruoyi-ui/src/utils/generator/render.js deleted file mode 100644 index e8640f0..0000000 --- a/ruoyi-ui/src/utils/generator/render.js +++ /dev/null @@ -1,126 +0,0 @@ -import { makeMap } from '@/utils/index' - -// 鍙傝僪ttps://github.com/vuejs/vue/blob/v2.6.10/src/platforms/web/server/util.js -const isAttr = makeMap( - 'accept,accept-charset,accesskey,action,align,alt,async,autocomplete,' - + 'autofocus,autoplay,autosave,bgcolor,border,buffered,challenge,charset,' - + 'checked,cite,class,code,codebase,color,cols,colspan,content,http-equiv,' - + 'name,contenteditable,contextmenu,controls,coords,data,datetime,default,' - + 'defer,dir,dirname,disabled,download,draggable,dropzone,enctype,method,for,' - + 'form,formaction,headers,height,hidden,high,href,hreflang,http-equiv,' - + 'icon,id,ismap,itemprop,keytype,kind,label,lang,language,list,loop,low,' - + 'manifest,max,maxlength,media,method,GET,POST,min,multiple,email,file,' - + 'muted,name,novalidate,open,optimum,pattern,ping,placeholder,poster,' - + 'preload,radiogroup,readonly,rel,required,reversed,rows,rowspan,sandbox,' - + 'scope,scoped,seamless,selected,shape,size,type,text,password,sizes,span,' - + 'spellcheck,src,srcdoc,srclang,srcset,start,step,style,summary,tabindex,' - + 'target,title,type,usemap,value,width,wrap' -) - -function vModel(self, dataObject, defaultValue) { - dataObject.props.value = defaultValue - - dataObject.on.input = val => { - self.$emit('input', val) - } -} - -const componentChild = { - 'el-button': { - default(h, conf, key) { - return conf[key] - }, - }, - 'el-input': { - prepend(h, conf, key) { - return - }, - append(h, conf, key) { - return - } - }, - 'el-select': { - options(h, conf, key) { - const list = [] - conf.options.forEach(item => { - list.push() - }) - return list - } - }, - 'el-radio-group': { - options(h, conf, key) { - const list = [] - conf.options.forEach(item => { - if (conf.optionType === 'button') list.push({item.label}) - else list.push({item.label}) - }) - return list - } - }, - 'el-checkbox-group': { - options(h, conf, key) { - const list = [] - conf.options.forEach(item => { - if (conf.optionType === 'button') { - list.push({item.label}) - } else { - list.push({item.label}) - } - }) - return list - } - }, - 'el-upload': { - 'list-type': (h, conf, key) => { - const list = [] - if (conf['list-type'] === 'picture-card') { - list.push() - } else { - list.push({conf.buttonText}) - } - if (conf.showTip) { - list.push(
鍙兘涓婁紶涓嶈秴杩 {conf.fileSize}{conf.sizeUnit} 鐨剓conf.accept}鏂囦欢
) - } - return list - } - } -} - -export default { - render(h) { - const dataObject = { - attrs: {}, - props: {}, - on: {}, - style: {} - } - const confClone = JSON.parse(JSON.stringify(this.conf)) - const children = [] - - const childObjs = componentChild[confClone.tag] - if (childObjs) { - Object.keys(childObjs).forEach(key => { - const childFunc = childObjs[key] - if (confClone[key]) { - children.push(childFunc(h, confClone, key)) - } - }) - } - - Object.keys(confClone).forEach(key => { - const val = confClone[key] - if (key === 'vModel') { - vModel(this, dataObject, confClone.defaultValue) - } else if (dataObject[key]) { - dataObject[key] = val - } else if (!isAttr(key)) { - dataObject.props[key] = val - } else { - dataObject.attrs[key] = val - } - }) - return h(this.conf.tag, dataObject, children) - }, - props: ['conf'] -} diff --git a/ruoyi-ui/src/utils/index.js b/ruoyi-ui/src/utils/index.js deleted file mode 100644 index df5db12..0000000 --- a/ruoyi-ui/src/utils/index.js +++ /dev/null @@ -1,390 +0,0 @@ -import { parseTime } from './ruoyi' - -/** - * 琛ㄦ牸鏃堕棿鏍煎紡鍖 - */ -export function formatDate(cellValue) { - if (cellValue == null || cellValue == "") return ""; - var date = new Date(cellValue) - var year = date.getFullYear() - var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1 - var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() - var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours() - var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes() - var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds() - return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds -} - -/** - * @param {number} time - * @param {string} option - * @returns {string} - */ -export function formatTime(time, option) { - if (('' + time).length === 10) { - time = parseInt(time) * 1000 - } else { - time = +time - } - const d = new Date(time) - const now = Date.now() - - const diff = (now - d) / 1000 - - if (diff < 30) { - return '鍒氬垰' - } else if (diff < 3600) { - // less 1 hour - return Math.ceil(diff / 60) + '鍒嗛挓鍓' - } else if (diff < 3600 * 24) { - return Math.ceil(diff / 3600) + '灏忔椂鍓' - } else if (diff < 3600 * 24 * 2) { - return '1澶╁墠' - } - if (option) { - return parseTime(time, option) - } else { - return ( - d.getMonth() + - 1 + - '鏈' + - d.getDate() + - '鏃' + - d.getHours() + - '鏃' + - d.getMinutes() + - '鍒' - ) - } -} - -/** - * @param {string} url - * @returns {Object} - */ -export function getQueryObject(url) { - url = url == null ? window.location.href : url - const search = url.substring(url.lastIndexOf('?') + 1) - const obj = {} - const reg = /([^?&=]+)=([^?&=]*)/g - search.replace(reg, (rs, $1, $2) => { - const name = decodeURIComponent($1) - let val = decodeURIComponent($2) - val = String(val) - obj[name] = val - return rs - }) - return obj -} - -/** - * @param {string} input value - * @returns {number} output value - */ -export function byteLength(str) { - // returns the byte length of an utf8 string - let s = str.length - for (var i = str.length - 1; i >= 0; i--) { - const code = str.charCodeAt(i) - if (code > 0x7f && code <= 0x7ff) s++ - else if (code > 0x7ff && code <= 0xffff) s += 2 - if (code >= 0xDC00 && code <= 0xDFFF) i-- - } - return s -} - -/** - * @param {Array} actual - * @returns {Array} - */ -export function cleanArray(actual) { - const newArray = [] - for (let i = 0; i < actual.length; i++) { - if (actual[i]) { - newArray.push(actual[i]) - } - } - return newArray -} - -/** - * @param {Object} json - * @returns {Array} - */ -export function param(json) { - if (!json) return '' - return cleanArray( - Object.keys(json).map(key => { - if (json[key] === undefined) return '' - return encodeURIComponent(key) + '=' + encodeURIComponent(json[key]) - }) - ).join('&') -} - -/** - * @param {string} url - * @returns {Object} - */ -export function param2Obj(url) { - const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ') - if (!search) { - return {} - } - const obj = {} - const searchArr = search.split('&') - searchArr.forEach(v => { - const index = v.indexOf('=') - if (index !== -1) { - const name = v.substring(0, index) - const val = v.substring(index + 1, v.length) - obj[name] = val - } - }) - return obj -} - -/** - * @param {string} val - * @returns {string} - */ -export function html2Text(val) { - const div = document.createElement('div') - div.innerHTML = val - return div.textContent || div.innerText -} - -/** - * Merges two objects, giving the last one precedence - * @param {Object} target - * @param {(Object|Array)} source - * @returns {Object} - */ -export function objectMerge(target, source) { - if (typeof target !== 'object') { - target = {} - } - if (Array.isArray(source)) { - return source.slice() - } - Object.keys(source).forEach(property => { - const sourceProperty = source[property] - if (typeof sourceProperty === 'object') { - target[property] = objectMerge(target[property], sourceProperty) - } else { - target[property] = sourceProperty - } - }) - return target -} - -/** - * @param {HTMLElement} element - * @param {string} className - */ -export function toggleClass(element, className) { - if (!element || !className) { - return - } - let classString = element.className - const nameIndex = classString.indexOf(className) - if (nameIndex === -1) { - classString += '' + className - } else { - classString = - classString.substr(0, nameIndex) + - classString.substr(nameIndex + className.length) - } - element.className = classString -} - -/** - * @param {string} type - * @returns {Date} - */ -export function getTime(type) { - if (type === 'start') { - return new Date().getTime() - 3600 * 1000 * 24 * 90 - } else { - return new Date(new Date().toDateString()) - } -} - -/** - * @param {Function} func - * @param {number} wait - * @param {boolean} immediate - * @return {*} - */ -export function debounce(func, wait, immediate) { - let timeout, args, context, timestamp, result - - const later = function() { - // 鎹笂涓娆¤Е鍙戞椂闂撮棿闅 - const last = +new Date() - timestamp - - // 涓婃琚寘瑁呭嚱鏁拌璋冪敤鏃堕棿闂撮殧 last 灏忎簬璁惧畾鏃堕棿闂撮殧 wait - if (last < wait && last > 0) { - timeout = setTimeout(later, wait - last) - } else { - timeout = null - // 濡傛灉璁惧畾涓篿mmediate===true锛屽洜涓哄紑濮嬭竟鐣屽凡缁忚皟鐢ㄨ繃浜嗘澶勬棤闇璋冪敤 - if (!immediate) { - result = func.apply(context, args) - if (!timeout) context = args = null - } - } - } - - return function(...args) { - context = this - timestamp = +new Date() - const callNow = immediate && !timeout - // 濡傛灉寤舵椂涓嶅瓨鍦紝閲嶆柊璁惧畾寤舵椂 - if (!timeout) timeout = setTimeout(later, wait) - if (callNow) { - result = func.apply(context, args) - context = args = null - } - - return result - } -} - -/** - * This is just a simple version of deep copy - * Has a lot of edge cases bug - * If you want to use a perfect deep copy, use lodash's _.cloneDeep - * @param {Object} source - * @returns {Object} - */ -export function deepClone(source) { - if (!source && typeof source !== 'object') { - throw new Error('error arguments', 'deepClone') - } - const targetObj = source.constructor === Array ? [] : {} - Object.keys(source).forEach(keys => { - if (source[keys] && typeof source[keys] === 'object') { - targetObj[keys] = deepClone(source[keys]) - } else { - targetObj[keys] = source[keys] - } - }) - return targetObj -} - -/** - * @param {Array} arr - * @returns {Array} - */ -export function uniqueArr(arr) { - return Array.from(new Set(arr)) -} - -/** - * @returns {string} - */ -export function createUniqueString() { - const timestamp = +new Date() + '' - const randomNum = parseInt((1 + Math.random()) * 65536) + '' - return (+(randomNum + timestamp)).toString(32) -} - -/** - * Check if an element has a class - * @param {HTMLElement} elm - * @param {string} cls - * @returns {boolean} - */ -export function hasClass(ele, cls) { - return !!ele.className.match(new RegExp('(\\s|^)' + cls + '(\\s|$)')) -} - -/** - * Add class to element - * @param {HTMLElement} elm - * @param {string} cls - */ -export function addClass(ele, cls) { - if (!hasClass(ele, cls)) ele.className += ' ' + cls -} - -/** - * Remove class from element - * @param {HTMLElement} elm - * @param {string} cls - */ -export function removeClass(ele, cls) { - if (hasClass(ele, cls)) { - const reg = new RegExp('(\\s|^)' + cls + '(\\s|$)') - ele.className = ele.className.replace(reg, ' ') - } -} - -export function makeMap(str, expectsLowerCase) { - const map = Object.create(null) - const list = str.split(',') - for (let i = 0; i < list.length; i++) { - map[list[i]] = true - } - return expectsLowerCase - ? val => map[val.toLowerCase()] - : val => map[val] -} - -export const exportDefault = 'export default ' - -export const beautifierConf = { - html: { - indent_size: '2', - indent_char: ' ', - max_preserve_newlines: '-1', - preserve_newlines: false, - keep_array_indentation: false, - break_chained_methods: false, - indent_scripts: 'separate', - brace_style: 'end-expand', - space_before_conditional: true, - unescape_strings: false, - jslint_happy: false, - end_with_newline: true, - wrap_line_length: '110', - indent_inner_html: true, - comma_first: false, - e4x: true, - indent_empty_lines: true - }, - js: { - indent_size: '2', - indent_char: ' ', - max_preserve_newlines: '-1', - preserve_newlines: false, - keep_array_indentation: false, - break_chained_methods: false, - indent_scripts: 'normal', - brace_style: 'end-expand', - space_before_conditional: true, - unescape_strings: false, - jslint_happy: true, - end_with_newline: true, - wrap_line_length: '110', - indent_inner_html: true, - comma_first: false, - e4x: true, - indent_empty_lines: true - } -} - -// 棣栧瓧姣嶅ぇ灏 -export function titleCase(str) { - return str.replace(/( |^)[a-z]/g, L => L.toUpperCase()) -} - -// 涓嬪垝杞┘宄 -export function camelCase(str) { - return str.replace(/_[a-z]/g, str1 => str1.substr(-1).toUpperCase()) -} - -export function isNumberStr(str) { - return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str) -} - diff --git a/ruoyi-ui/src/utils/jsencrypt.js b/ruoyi-ui/src/utils/jsencrypt.js deleted file mode 100644 index 78d9523..0000000 --- a/ruoyi-ui/src/utils/jsencrypt.js +++ /dev/null @@ -1,30 +0,0 @@ -import JSEncrypt from 'jsencrypt/bin/jsencrypt.min' - -// 瀵嗛挜瀵圭敓鎴 http://web.chacuo.net/netrsakeypair - -const publicKey = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdH\n' + - 'nzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ==' - -const privateKey = 'MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY\n' + - '7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKN\n' + - 'PuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gA\n' + - 'kM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWow\n' + - 'cSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99Ecv\n' + - 'DQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthh\n' + - 'YhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3\n' + - 'UP8iWi1Qw0Y=' - -// 鍔犲瘑 -export function encrypt(txt) { - const encryptor = new JSEncrypt() - encryptor.setPublicKey(publicKey) // 璁剧疆鍏挜 - return encryptor.encrypt(txt) // 瀵规暟鎹繘琛屽姞瀵 -} - -// 瑙e瘑 -export function decrypt(txt) { - const encryptor = new JSEncrypt() - encryptor.setPrivateKey(privateKey) // 璁剧疆绉侀挜 - return encryptor.decrypt(txt) // 瀵规暟鎹繘琛岃В瀵 -} - diff --git a/ruoyi-ui/src/utils/permission.js b/ruoyi-ui/src/utils/permission.js deleted file mode 100644 index 189a716..0000000 --- a/ruoyi-ui/src/utils/permission.js +++ /dev/null @@ -1,47 +0,0 @@ -import store from '@/store' - -/** - * 瀛楃鏉冮檺鏍¢獙 - * @param {Array} value 鏍¢獙鍊 - * @returns {Boolean} - */ -export function checkPermi(value) { - if (value && value instanceof Array && value.length > 0) { - const permissions = store.getters && store.getters.permissions - const permissionDatas = value - const all_permission = "*:*:*"; - - const hasPermission = permissions.some(permission => { - return all_permission === permission || permissionDatas.includes(permission) - }) - - return hasPermission; - - } else { - console.error(`need roles! Like checkPermi="['system:user:add','system:user:edit']"`) - return false - } -} - -/** - * 瑙掕壊鏉冮檺鏍¢獙 - * @param {Array} value 鏍¢獙鍊 - * @returns {Boolean} - */ -export function checkRole(value) { - if (value && value instanceof Array && value.length > 0) { - const roles = store.getters && store.getters.roles - const permissionRoles = value - const super_admin = "admin"; - - const hasRole = roles.some(role => { - return super_admin === role || permissionRoles.includes(role) - }) - - return hasRole; - - } else { - console.error(`need roles! Like checkRole="['admin','editor']"`) - return false - } -} \ No newline at end of file diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js deleted file mode 100644 index ffb0d21..0000000 --- a/ruoyi-ui/src/utils/request.js +++ /dev/null @@ -1,152 +0,0 @@ -import axios from 'axios' -import { Notification, MessageBox, Message, Loading } from 'element-ui' -import store from '@/store' -import { getToken } from '@/utils/auth' -import errorCode from '@/utils/errorCode' -import { tansParams, blobValidate } from "@/utils/ruoyi"; -import cache from '@/plugins/cache' -import { saveAs } from 'file-saver' - -let downloadLoadingInstance; -// 鏄惁鏄剧ず閲嶆柊鐧诲綍 -export let isRelogin = { show: false }; - -axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' -// 鍒涘缓axios瀹炰緥 -const service = axios.create({ - // axios涓姹傞厤缃湁baseURL閫夐」锛岃〃绀鸿姹俇RL鍏叡閮ㄥ垎 - baseURL: process.env.VUE_APP_BASE_API, - // 瓒呮椂 - timeout: 10000 -}) - -// request鎷︽埅鍣 -service.interceptors.request.use(config => { - // 鏄惁闇瑕佽缃 token - const isToken = (config.headers || {}).isToken === false - // 鏄惁闇瑕侀槻姝㈡暟鎹噸澶嶆彁浜 - const isRepeatSubmit = (config.headers || {}).repeatSubmit === false - if (getToken() && !isToken) { - config.headers['Authorization'] = 'Bearer ' + getToken() // 璁╂瘡涓姹傛惡甯﹁嚜瀹氫箟token 璇锋牴鎹疄闄呮儏鍐佃嚜琛屼慨鏀 - } - // get璇锋眰鏄犲皠params鍙傛暟 - if (config.method === 'get' && config.params) { - let url = config.url + '?' + tansParams(config.params); - url = url.slice(0, -1); - config.params = {}; - config.url = url; - } - if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) { - const requestObj = { - url: config.url, - data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data, - time: new Date().getTime() - } - const requestSize = Object.keys(JSON.stringify(requestObj)).length; // 璇锋眰鏁版嵁澶у皬 - const limitSize = 5 * 1024 * 1024; // 闄愬埗瀛樻斁鏁版嵁5M - if (requestSize >= limitSize) { - console.warn(`[${config.url}]: ` + '璇锋眰鏁版嵁澶у皬瓒呭嚭鍏佽鐨5M闄愬埗锛屾棤娉曡繘琛岄槻閲嶅鎻愪氦楠岃瘉銆') - return config; - } - const sessionObj = cache.session.getJSON('sessionObj') - if (sessionObj === undefined || sessionObj === null || sessionObj === '') { - cache.session.setJSON('sessionObj', requestObj) - } else { - const s_url = sessionObj.url; // 璇锋眰鍦板潃 - const s_data = sessionObj.data; // 璇锋眰鏁版嵁 - const s_time = sessionObj.time; // 璇锋眰鏃堕棿 - const interval = 1000; // 闂撮殧鏃堕棿(ms)锛屽皬浜庢鏃堕棿瑙嗕负閲嶅鎻愪氦 - if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) { - const message = '鏁版嵁姝e湪澶勭悊锛岃鍕块噸澶嶆彁浜'; - console.warn(`[${s_url}]: ` + message) - return Promise.reject(new Error(message)) - } else { - cache.session.setJSON('sessionObj', requestObj) - } - } - } - return config -}, error => { - console.log(error) - Promise.reject(error) -}) - -// 鍝嶅簲鎷︽埅鍣 -service.interceptors.response.use(res => { - // 鏈缃姸鎬佺爜鍒欓粯璁ゆ垚鍔熺姸鎬 - const code = res.data.code || 200; - // 鑾峰彇閿欒淇℃伅 - const msg = errorCode[code] || res.data.msg || errorCode['default'] - // 浜岃繘鍒舵暟鎹垯鐩存帴杩斿洖 - if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') { - return res.data - } - if (code === 401) { - if (!isRelogin.show) { - isRelogin.show = true; - MessageBox.confirm('鐧诲綍鐘舵佸凡杩囨湡锛屾偍鍙互缁х画鐣欏湪璇ラ〉闈紝鎴栬呴噸鏂扮櫥褰', '绯荤粺鎻愮ず', { confirmButtonText: '閲嶆柊鐧诲綍', cancelButtonText: '鍙栨秷', type: 'warning' }).then(() => { - isRelogin.show = false; - store.dispatch('LogOut').then(() => { - location.href = '/index'; - }) - }).catch(() => { - isRelogin.show = false; - }); - } - return Promise.reject('鏃犳晥鐨勪細璇濓紝鎴栬呬細璇濆凡杩囨湡锛岃閲嶆柊鐧诲綍銆') - } else if (code === 500) { - Message({ message: msg, type: 'error' }) - return Promise.reject(new Error(msg)) - } else if (code === 601) { - Message({ message: msg, type: 'warning' }) - return Promise.reject('error') - } else if (code !== 200) { - Notification.error({ title: msg }) - return Promise.reject('error') - } else { - return res.data - } - }, - error => { - console.log('err' + error) - let { message } = error; - if (message == "Network Error") { - message = "鍚庣鎺ュ彛杩炴帴寮傚父"; - } else if (message.includes("timeout")) { - message = "绯荤粺鎺ュ彛璇锋眰瓒呮椂"; - } else if (message.includes("Request failed with status code")) { - message = "绯荤粺鎺ュ彛" + message.substr(message.length - 3) + "寮傚父"; - } - Message({ message: message, type: 'error', duration: 5 * 1000 }) - return Promise.reject(error) - } -) - -// 閫氱敤涓嬭浇鏂规硶 -export function download(url, params, filename, config) { - downloadLoadingInstance = Loading.service({ text: "姝e湪涓嬭浇鏁版嵁锛岃绋嶅", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", }) - return service.post(url, params, { - transformRequest: [(params) => { return tansParams(params) }], - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - responseType: 'blob', - ...config - }).then(async (data) => { - const isBlob = blobValidate(data); - if (isBlob) { - const blob = new Blob([data]) - saveAs(blob, filename) - } else { - const resText = await data.text(); - const rspObj = JSON.parse(resText); - const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default'] - Message.error(errMsg); - } - downloadLoadingInstance.close(); - }).catch((r) => { - console.error(r) - Message.error('涓嬭浇鏂囦欢鍑虹幇閿欒锛岃鑱旂郴绠$悊鍛橈紒') - downloadLoadingInstance.close(); - }) -} - -export default service diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js deleted file mode 100644 index 44bf9c4..0000000 --- a/ruoyi-ui/src/utils/ruoyi.js +++ /dev/null @@ -1,233 +0,0 @@ - - -/** - * 閫氱敤js鏂规硶灏佽澶勭悊 - * Copyright (c) 2019 ruoyi - */ - -// 鏃ユ湡鏍煎紡鍖 -export function parseTime(time, pattern) { - if (arguments.length === 0 || !time) { - return null - } - const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}' - let date - if (typeof time === 'object') { - date = time - } else { - if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { - time = parseInt(time) - } else if (typeof time === 'string') { - time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), ''); - } - if ((typeof time === 'number') && (time.toString().length === 10)) { - time = time * 1000 - } - date = new Date(time) - } - const formatObj = { - y: date.getFullYear(), - m: date.getMonth() + 1, - d: date.getDate(), - h: date.getHours(), - i: date.getMinutes(), - s: date.getSeconds(), - a: date.getDay() - } - const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => { - let value = formatObj[key] - // Note: getDay() returns 0 on Sunday - if (key === 'a') { return ['鏃', '涓', '浜', '涓', '鍥', '浜', '鍏'][value] } - if (result.length > 0 && value < 10) { - value = '0' + value - } - return value || 0 - }) - return time_str -} - -// 琛ㄥ崟閲嶇疆 -export function resetForm(refName) { - if (this.$refs[refName]) { - this.$refs[refName].resetFields(); - } -} - -// 娣诲姞鏃ユ湡鑼冨洿 -export function addDateRange(params, dateRange, propName) { - let search = params; - search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {}; - dateRange = Array.isArray(dateRange) ? dateRange : []; - if (typeof (propName) === 'undefined') { - search.params['beginTime'] = dateRange[0]; - search.params['endTime'] = dateRange[1]; - } else { - search.params['begin' + propName] = dateRange[0]; - search.params['end' + propName] = dateRange[1]; - } - return search; -} - -// 鍥炴樉鏁版嵁瀛楀吀 -export function selectDictLabel(datas, value) { - if (value === undefined) { - return ""; - } - var actions = []; - Object.keys(datas).some((key) => { - if (datas[key].value == ('' + value)) { - actions.push(datas[key].label); - return true; - } - }) - if (actions.length === 0) { - actions.push(value); - } - return actions.join(''); -} - -// 鍥炴樉鏁版嵁瀛楀吀锛堝瓧绗︿覆銆佹暟缁勶級 -export function selectDictLabels(datas, value, separator) { - if (value === undefined || value.length ===0) { - return ""; - } - if (Array.isArray(value)) { - value = value.join(","); - } - var actions = []; - var currentSeparator = undefined === separator ? "," : separator; - var temp = value.split(currentSeparator); - Object.keys(value.split(currentSeparator)).some((val) => { - var match = false; - Object.keys(datas).some((key) => { - if (datas[key].value == ('' + temp[val])) { - actions.push(datas[key].label + currentSeparator); - match = true; - } - }) - if (!match) { - actions.push(temp[val] + currentSeparator); - } - }) - return actions.join('').substring(0, actions.join('').length - 1); -} - -// 瀛楃涓叉牸寮忓寲(%s ) -export function sprintf(str) { - var args = arguments, flag = true, i = 1; - str = str.replace(/%s/g, function () { - var arg = args[i++]; - if (typeof arg === 'undefined') { - flag = false; - return ''; - } - return arg; - }); - return flag ? str : ''; -} - -// 杞崲瀛楃涓诧紝undefined,null绛夎浆鍖栦负"" -export function parseStrEmpty(str) { - if (!str || str == "undefined" || str == "null") { - return ""; - } - return str; -} - -// 鏁版嵁鍚堝苟 -export function mergeRecursive(source, target) { - for (var p in target) { - try { - if (target[p].constructor == Object) { - source[p] = mergeRecursive(source[p], target[p]); - } else { - source[p] = target[p]; - } - } catch (e) { - source[p] = target[p]; - } - } - return source; -}; - -/** - * 鏋勯犳爲鍨嬬粨鏋勬暟鎹 - * @param {*} data 鏁版嵁婧 - * @param {*} id id瀛楁 榛樿 'id' - * @param {*} parentId 鐖惰妭鐐瑰瓧娈 榛樿 'parentId' - * @param {*} children 瀛╁瓙鑺傜偣瀛楁 榛樿 'children' - */ -export function handleTree(data, id, parentId, children) { - let config = { - id: id || 'id', - parentId: parentId || 'parentId', - childrenList: children || 'children' - }; - - var childrenListMap = {}; - var nodeIds = {}; - var tree = []; - - for (let d of data) { - let parentId = d[config.parentId]; - if (childrenListMap[parentId] == null) { - childrenListMap[parentId] = []; - } - nodeIds[d[config.id]] = d; - childrenListMap[parentId].push(d); - } - - for (let d of data) { - let parentId = d[config.parentId]; - if (nodeIds[parentId] == null) { - tree.push(d); - } - } - - for (let t of tree) { - adaptToChildrenList(t); - } - - function adaptToChildrenList(o) { - if (childrenListMap[o[config.id]] !== null) { - o[config.childrenList] = childrenListMap[o[config.id]]; - } - if (o[config.childrenList]) { - for (let c of o[config.childrenList]) { - adaptToChildrenList(c); - } - } - } - return tree; -} - -/** -* 鍙傛暟澶勭悊 -* @param {*} params 鍙傛暟 -*/ -export function tansParams(params) { - let result = '' - for (const propName of Object.keys(params)) { - const value = params[propName]; - var part = encodeURIComponent(propName) + "="; - if (value !== null && value !== "" && typeof (value) !== "undefined") { - if (typeof value === 'object') { - for (const key of Object.keys(value)) { - if (value[key] !== null && value[key] !== "" && typeof (value[key]) !== 'undefined') { - let params = propName + '[' + key + ']'; - var subPart = encodeURIComponent(params) + "="; - result += subPart + encodeURIComponent(value[key]) + "&"; - } - } - } else { - result += part + encodeURIComponent(value) + "&"; - } - } - } - return result -} - -// 楠岃瘉鏄惁涓篵lob鏍煎紡 -export function blobValidate(data) { - return data.type !== 'application/json' -} diff --git a/ruoyi-ui/src/utils/scroll-to.js b/ruoyi-ui/src/utils/scroll-to.js deleted file mode 100644 index c5d8e04..0000000 --- a/ruoyi-ui/src/utils/scroll-to.js +++ /dev/null @@ -1,58 +0,0 @@ -Math.easeInOutQuad = function(t, b, c, d) { - t /= d / 2 - if (t < 1) { - return c / 2 * t * t + b - } - t-- - return -c / 2 * (t * (t - 2) - 1) + b -} - -// requestAnimationFrame for Smart Animating http://goo.gl/sx5sts -var requestAnimFrame = (function() { - return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || function(callback) { window.setTimeout(callback, 1000 / 60) } -})() - -/** - * Because it's so fucking difficult to detect the scrolling element, just move them all - * @param {number} amount - */ -function move(amount) { - document.documentElement.scrollTop = amount - document.body.parentNode.scrollTop = amount - document.body.scrollTop = amount -} - -function position() { - return document.documentElement.scrollTop || document.body.parentNode.scrollTop || document.body.scrollTop -} - -/** - * @param {number} to - * @param {number} duration - * @param {Function} callback - */ -export function scrollTo(to, duration, callback) { - const start = position() - const change = to - start - const increment = 20 - let currentTime = 0 - duration = (typeof (duration) === 'undefined') ? 500 : duration - var animateScroll = function() { - // increment the time - currentTime += increment - // find the value with the quadratic in-out easing function - var val = Math.easeInOutQuad(currentTime, start, change, duration) - // move the document.body - move(val) - // do the animation unless its over - if (currentTime < duration) { - requestAnimFrame(animateScroll) - } else { - if (callback && typeof (callback) === 'function') { - // the animation is done so lets callback - callback() - } - } - } - animateScroll() -} diff --git a/ruoyi-ui/src/utils/validate.js b/ruoyi-ui/src/utils/validate.js deleted file mode 100644 index 57a568e..0000000 --- a/ruoyi-ui/src/utils/validate.js +++ /dev/null @@ -1,80 +0,0 @@ -/** - * @param {string} path - * @returns {Boolean} - */ -export function isExternal(path) { - return /^(https?:|mailto:|tel:)/.test(path) -} - -/** - * @param {string} str - * @returns {Boolean} - */ -export function validUsername(str) { - const valid_map = ['admin', 'editor'] - return valid_map.indexOf(str.trim()) >= 0 -} - -/** - * @param {string} url - * @returns {Boolean} - */ -export function validURL(url) { - const reg = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/ - return reg.test(url) -} - -/** - * @param {string} str - * @returns {Boolean} - */ -export function validLowerCase(str) { - const reg = /^[a-z]+$/ - return reg.test(str) -} - -/** - * @param {string} str - * @returns {Boolean} - */ -export function validUpperCase(str) { - const reg = /^[A-Z]+$/ - return reg.test(str) -} - -/** - * @param {string} str - * @returns {Boolean} - */ -export function validAlphabets(str) { - const reg = /^[A-Za-z]+$/ - return reg.test(str) -} - -/** - * @param {string} email - * @returns {Boolean} - */ -export function validEmail(email) { - const reg = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/ - return reg.test(email) -} - -/** - * @param {string} str - * @returns {Boolean} - */ -export function isString(str) { - return typeof str === 'string' || str instanceof String; -} - -/** - * @param {Array} arg - * @returns {Boolean} - */ -export function isArray(arg) { - if (typeof Array.isArray === 'undefined') { - return Object.prototype.toString.call(arg) === '[object Array]' - } - return Array.isArray(arg) -} diff --git a/ruoyi-ui/src/views/dashboard/BarChart.vue b/ruoyi-ui/src/views/dashboard/BarChart.vue deleted file mode 100644 index 88e7ef6..0000000 --- a/ruoyi-ui/src/views/dashboard/BarChart.vue +++ /dev/null @@ -1,102 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/dashboard/LineChart.vue b/ruoyi-ui/src/views/dashboard/LineChart.vue deleted file mode 100644 index 702ff73..0000000 --- a/ruoyi-ui/src/views/dashboard/LineChart.vue +++ /dev/null @@ -1,135 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/dashboard/PanelGroup.vue b/ruoyi-ui/src/views/dashboard/PanelGroup.vue deleted file mode 100644 index 1a1081f..0000000 --- a/ruoyi-ui/src/views/dashboard/PanelGroup.vue +++ /dev/null @@ -1,181 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/views/dashboard/PieChart.vue b/ruoyi-ui/src/views/dashboard/PieChart.vue deleted file mode 100644 index 63f0d84..0000000 --- a/ruoyi-ui/src/views/dashboard/PieChart.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/dashboard/RaddarChart.vue b/ruoyi-ui/src/views/dashboard/RaddarChart.vue deleted file mode 100644 index 312e018..0000000 --- a/ruoyi-ui/src/views/dashboard/RaddarChart.vue +++ /dev/null @@ -1,116 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/dashboard/mixins/resize.js b/ruoyi-ui/src/views/dashboard/mixins/resize.js deleted file mode 100644 index b1e76e9..0000000 --- a/ruoyi-ui/src/views/dashboard/mixins/resize.js +++ /dev/null @@ -1,56 +0,0 @@ -import { debounce } from '@/utils' - -export default { - data() { - return { - $_sidebarElm: null, - $_resizeHandler: null - } - }, - mounted() { - this.initListener() - }, - activated() { - if (!this.$_resizeHandler) { - // avoid duplication init - this.initListener() - } - - // when keep-alive chart activated, auto resize - this.resize() - }, - beforeDestroy() { - this.destroyListener() - }, - deactivated() { - this.destroyListener() - }, - methods: { - // use $_ for mixins properties - // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential - $_sidebarResizeHandler(e) { - if (e.propertyName === 'width') { - this.$_resizeHandler() - } - }, - initListener() { - this.$_resizeHandler = debounce(() => { - this.resize() - }, 100) - window.addEventListener('resize', this.$_resizeHandler) - - this.$_sidebarElm = document.getElementsByClassName('sidebar-container')[0] - this.$_sidebarElm && this.$_sidebarElm.addEventListener('transitionend', this.$_sidebarResizeHandler) - }, - destroyListener() { - window.removeEventListener('resize', this.$_resizeHandler) - this.$_resizeHandler = null - - this.$_sidebarElm && this.$_sidebarElm.removeEventListener('transitionend', this.$_sidebarResizeHandler) - }, - resize() { - const { chart } = this - chart && chart.resize() - } - } -} diff --git a/ruoyi-ui/src/views/error/401.vue b/ruoyi-ui/src/views/error/401.vue deleted file mode 100644 index 448b6ec..0000000 --- a/ruoyi-ui/src/views/error/401.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/views/error/404.vue b/ruoyi-ui/src/views/error/404.vue deleted file mode 100644 index 96f075c..0000000 --- a/ruoyi-ui/src/views/error/404.vue +++ /dev/null @@ -1,233 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue deleted file mode 100644 index 1a7310a..0000000 --- a/ruoyi-ui/src/views/index.vue +++ /dev/null @@ -1,1067 +0,0 @@ - - - - - - diff --git a/ruoyi-ui/src/views/index_v1.vue b/ruoyi-ui/src/views/index_v1.vue deleted file mode 100644 index d2d2ec6..0000000 --- a/ruoyi-ui/src/views/index_v1.vue +++ /dev/null @@ -1,98 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue deleted file mode 100644 index 06c09d2..0000000 --- a/ruoyi-ui/src/views/login.vue +++ /dev/null @@ -1,219 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/views/monitor/cache/index.vue b/ruoyi-ui/src/views/monitor/cache/index.vue deleted file mode 100644 index 8d2f378..0000000 --- a/ruoyi-ui/src/views/monitor/cache/index.vue +++ /dev/null @@ -1,148 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/monitor/cache/list.vue b/ruoyi-ui/src/views/monitor/cache/list.vue deleted file mode 100644 index 29a7c74..0000000 --- a/ruoyi-ui/src/views/monitor/cache/list.vue +++ /dev/null @@ -1,241 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/monitor/druid/index.vue b/ruoyi-ui/src/views/monitor/druid/index.vue deleted file mode 100644 index c6ad585..0000000 --- a/ruoyi-ui/src/views/monitor/druid/index.vue +++ /dev/null @@ -1,15 +0,0 @@ - - diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue deleted file mode 100644 index 892c727..0000000 --- a/ruoyi-ui/src/views/monitor/job/index.vue +++ /dev/null @@ -1,513 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue deleted file mode 100644 index 60bee1d..0000000 --- a/ruoyi-ui/src/views/monitor/job/log.vue +++ /dev/null @@ -1,295 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/monitor/logininfor/index.vue b/ruoyi-ui/src/views/monitor/logininfor/index.vue deleted file mode 100644 index d6af834..0000000 --- a/ruoyi-ui/src/views/monitor/logininfor/index.vue +++ /dev/null @@ -1,246 +0,0 @@ - - - - diff --git a/ruoyi-ui/src/views/monitor/online/index.vue b/ruoyi-ui/src/views/monitor/online/index.vue deleted file mode 100644 index ad613c9..0000000 --- a/ruoyi-ui/src/views/monitor/online/index.vue +++ /dev/null @@ -1,122 +0,0 @@ - - - - diff --git a/ruoyi-ui/src/views/monitor/operlog/index.vue b/ruoyi-ui/src/views/monitor/operlog/index.vue deleted file mode 100644 index 4a1828f..0000000 --- a/ruoyi-ui/src/views/monitor/operlog/index.vue +++ /dev/null @@ -1,323 +0,0 @@ - - - - diff --git a/ruoyi-ui/src/views/monitor/server/index.vue b/ruoyi-ui/src/views/monitor/server/index.vue deleted file mode 100644 index 15ffc9a..0000000 --- a/ruoyi-ui/src/views/monitor/server/index.vue +++ /dev/null @@ -1,207 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/redirect.vue b/ruoyi-ui/src/views/redirect.vue deleted file mode 100644 index db4c1d6..0000000 --- a/ruoyi-ui/src/views/redirect.vue +++ /dev/null @@ -1,12 +0,0 @@ - diff --git a/ruoyi-ui/src/views/register.vue b/ruoyi-ui/src/views/register.vue deleted file mode 100644 index 7bf6f43..0000000 --- a/ruoyi-ui/src/views/register.vue +++ /dev/null @@ -1,210 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/views/system/config/index.vue b/ruoyi-ui/src/views/system/config/index.vue deleted file mode 100644 index 3ab81fc..0000000 --- a/ruoyi-ui/src/views/system/config/index.vue +++ /dev/null @@ -1,343 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/system/dept/index.vue b/ruoyi-ui/src/views/system/dept/index.vue deleted file mode 100644 index e502b4e..0000000 --- a/ruoyi-ui/src/views/system/dept/index.vue +++ /dev/null @@ -1,340 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/system/dict/data.vue b/ruoyi-ui/src/views/system/dict/data.vue deleted file mode 100644 index 3befe4a..0000000 --- a/ruoyi-ui/src/views/system/dict/data.vue +++ /dev/null @@ -1,402 +0,0 @@ - - - \ No newline at end of file diff --git a/ruoyi-ui/src/views/system/dict/index.vue b/ruoyi-ui/src/views/system/dict/index.vue deleted file mode 100644 index 6ca5457..0000000 --- a/ruoyi-ui/src/views/system/dict/index.vue +++ /dev/null @@ -1,347 +0,0 @@ - - - \ No newline at end of file diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue deleted file mode 100644 index c703fa0..0000000 --- a/ruoyi-ui/src/views/system/menu/index.vue +++ /dev/null @@ -1,452 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/system/notice/index.vue b/ruoyi-ui/src/views/system/notice/index.vue deleted file mode 100644 index 7982b54..0000000 --- a/ruoyi-ui/src/views/system/notice/index.vue +++ /dev/null @@ -1,312 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/system/post/index.vue b/ruoyi-ui/src/views/system/post/index.vue deleted file mode 100644 index 444bf63..0000000 --- a/ruoyi-ui/src/views/system/post/index.vue +++ /dev/null @@ -1,309 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/system/role/authUser.vue b/ruoyi-ui/src/views/system/role/authUser.vue deleted file mode 100644 index 147aa33..0000000 --- a/ruoyi-ui/src/views/system/role/authUser.vue +++ /dev/null @@ -1,199 +0,0 @@ - - - \ No newline at end of file diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue deleted file mode 100644 index fb3b5ef..0000000 --- a/ruoyi-ui/src/views/system/role/index.vue +++ /dev/null @@ -1,605 +0,0 @@ - - - \ No newline at end of file diff --git a/ruoyi-ui/src/views/system/role/selectUser.vue b/ruoyi-ui/src/views/system/role/selectUser.vue deleted file mode 100644 index b2b072f..0000000 --- a/ruoyi-ui/src/views/system/role/selectUser.vue +++ /dev/null @@ -1,138 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/system/user/authRole.vue b/ruoyi-ui/src/views/system/user/authRole.vue deleted file mode 100644 index 943710e..0000000 --- a/ruoyi-ui/src/views/system/user/authRole.vue +++ /dev/null @@ -1,117 +0,0 @@ - - - \ No newline at end of file diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue deleted file mode 100644 index 6b2a0aa..0000000 --- a/ruoyi-ui/src/views/system/user/index.vue +++ /dev/null @@ -1,676 +0,0 @@ - - - \ No newline at end of file diff --git a/ruoyi-ui/src/views/system/user/profile/index.vue b/ruoyi-ui/src/views/system/user/profile/index.vue deleted file mode 100644 index 529c564..0000000 --- a/ruoyi-ui/src/views/system/user/profile/index.vue +++ /dev/null @@ -1,91 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/system/user/profile/resetPwd.vue b/ruoyi-ui/src/views/system/user/profile/resetPwd.vue deleted file mode 100644 index f329e6e..0000000 --- a/ruoyi-ui/src/views/system/user/profile/resetPwd.vue +++ /dev/null @@ -1,69 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue deleted file mode 100644 index cbf3ca1..0000000 --- a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue +++ /dev/null @@ -1,184 +0,0 @@ - - - - diff --git a/ruoyi-ui/src/views/system/user/profile/userInfo.vue b/ruoyi-ui/src/views/system/user/profile/userInfo.vue deleted file mode 100644 index c970dc9..0000000 --- a/ruoyi-ui/src/views/system/user/profile/userInfo.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/tool/build/CodeTypeDialog.vue b/ruoyi-ui/src/views/tool/build/CodeTypeDialog.vue deleted file mode 100644 index b5c2e2e..0000000 --- a/ruoyi-ui/src/views/tool/build/CodeTypeDialog.vue +++ /dev/null @@ -1,106 +0,0 @@ - - diff --git a/ruoyi-ui/src/views/tool/build/DraggableItem.vue b/ruoyi-ui/src/views/tool/build/DraggableItem.vue deleted file mode 100644 index e881778..0000000 --- a/ruoyi-ui/src/views/tool/build/DraggableItem.vue +++ /dev/null @@ -1,100 +0,0 @@ - diff --git a/ruoyi-ui/src/views/tool/build/IconsDialog.vue b/ruoyi-ui/src/views/tool/build/IconsDialog.vue deleted file mode 100644 index 958be50..0000000 --- a/ruoyi-ui/src/views/tool/build/IconsDialog.vue +++ /dev/null @@ -1,123 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/tool/build/RightPanel.vue b/ruoyi-ui/src/views/tool/build/RightPanel.vue deleted file mode 100644 index c2760eb..0000000 --- a/ruoyi-ui/src/views/tool/build/RightPanel.vue +++ /dev/null @@ -1,946 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue b/ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue deleted file mode 100644 index fa7f0b2..0000000 --- a/ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue +++ /dev/null @@ -1,149 +0,0 @@ - - diff --git a/ruoyi-ui/src/views/tool/build/index.vue b/ruoyi-ui/src/views/tool/build/index.vue deleted file mode 100644 index 2bd298b..0000000 --- a/ruoyi-ui/src/views/tool/build/index.vue +++ /dev/null @@ -1,768 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/views/tool/gen/basicInfoForm.vue b/ruoyi-ui/src/views/tool/gen/basicInfoForm.vue deleted file mode 100644 index 7029529..0000000 --- a/ruoyi-ui/src/views/tool/gen/basicInfoForm.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/tool/gen/createTable.vue b/ruoyi-ui/src/views/tool/gen/createTable.vue deleted file mode 100644 index f914b5d..0000000 --- a/ruoyi-ui/src/views/tool/gen/createTable.vue +++ /dev/null @@ -1,45 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/tool/gen/editTable.vue b/ruoyi-ui/src/views/tool/gen/editTable.vue deleted file mode 100644 index 951497a..0000000 --- a/ruoyi-ui/src/views/tool/gen/editTable.vue +++ /dev/null @@ -1,234 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/tool/gen/genInfoForm.vue b/ruoyi-ui/src/views/tool/gen/genInfoForm.vue deleted file mode 100644 index 98daf6d..0000000 --- a/ruoyi-ui/src/views/tool/gen/genInfoForm.vue +++ /dev/null @@ -1,312 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/tool/gen/importTable.vue b/ruoyi-ui/src/views/tool/gen/importTable.vue deleted file mode 100644 index 3ea9532..0000000 --- a/ruoyi-ui/src/views/tool/gen/importTable.vue +++ /dev/null @@ -1,120 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue deleted file mode 100644 index 9237c30..0000000 --- a/ruoyi-ui/src/views/tool/gen/index.vue +++ /dev/null @@ -1,354 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/tool/swagger/index.vue b/ruoyi-ui/src/views/tool/swagger/index.vue deleted file mode 100644 index b8becc6..0000000 --- a/ruoyi-ui/src/views/tool/swagger/index.vue +++ /dev/null @@ -1,15 +0,0 @@ - - diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js deleted file mode 100644 index 85f3133..0000000 --- a/ruoyi-ui/vue.config.js +++ /dev/null @@ -1,130 +0,0 @@ -'use strict' -const path = require('path') - -function resolve(dir) { - return path.join(__dirname, dir) -} - -const CompressionPlugin = require('compression-webpack-plugin') - -const name = process.env.VUE_APP_TITLE || '鑻ヤ緷绠$悊绯荤粺' // 缃戦〉鏍囬 - -const port = process.env.port || process.env.npm_config_port || 80 // 绔彛 - -// vue.config.js 閰嶇疆璇存槑 -//瀹樻柟vue.config.js 鍙傝冩枃妗 https://cli.vuejs.org/zh/config/#css-loaderoptions -// 杩欓噷鍙垪涓閮ㄥ垎锛屽叿浣撻厤缃弬鑰冩枃妗 -module.exports = { - // 閮ㄧ讲鐢熶骇鐜鍜屽紑鍙戠幆澧冧笅鐨刄RL銆 - // 榛樿鎯呭喌涓嬶紝Vue CLI 浼氬亣璁句綘鐨勫簲鐢ㄦ槸琚儴缃插湪涓涓煙鍚嶇殑鏍硅矾寰勪笂 - // 渚嬪 https://www.ruoyi.vip/銆傚鏋滃簲鐢ㄨ閮ㄧ讲鍦ㄤ竴涓瓙璺緞涓婏紝浣犲氨闇瑕佺敤杩欎釜閫夐」鎸囧畾杩欎釜瀛愯矾寰勩備緥濡傦紝濡傛灉浣犵殑搴旂敤琚儴缃插湪 https://www.ruoyi.vip/admin/锛屽垯璁剧疆 baseUrl 涓 /admin/銆 - publicPath: process.env.NODE_ENV === "production" ? "/" : "/", - // 鍦╪pm run build 鎴 yarn build 鏃 锛岀敓鎴愭枃浠剁殑鐩綍鍚嶇О锛堣鍜宐aseUrl鐨勭敓浜х幆澧冭矾寰勪竴鑷达級锛堥粯璁ist锛 - outputDir: 'dist', - // 鐢ㄤ簬鏀剧疆鐢熸垚鐨勯潤鎬佽祫婧 (js銆乧ss銆乮mg銆乫onts) 鐨勶紱锛堥」鐩墦鍖呬箣鍚庯紝闈欐佽祫婧愪細鏀惧湪杩欎釜鏂囦欢澶逛笅锛 - assetsDir: 'static', - // 鏄惁寮鍚痚slint淇濆瓨妫娴嬶紝鏈夋晥鍊硷細ture | false | 'error' - lintOnSave: process.env.NODE_ENV === 'development', - // 濡傛灉浣犱笉闇瑕佺敓浜х幆澧冪殑 source map锛屽彲浠ュ皢鍏惰缃负 false 浠ュ姞閫熺敓浜х幆澧冩瀯寤恒 - productionSourceMap: false, - // webpack-dev-server 鐩稿叧閰嶇疆 - devServer: { - host: '0.0.0.0', - port: port, - open: true, - proxy: { - // detail: https://cli.vuejs.org/config/#devserver-proxy - [process.env.VUE_APP_BASE_API]: { - target: `http://localhost:8080`, - changeOrigin: true, - pathRewrite: { - ['^' + process.env.VUE_APP_BASE_API]: '' - } - } - }, - disableHostCheck: true - }, - css: { - loaderOptions: { - sass: { - sassOptions: { outputStyle: "expanded" } - } - } - }, - configureWebpack: { - name: name, - resolve: { - alias: { - '@': resolve('src') - } - }, - plugins: [ - // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#浣跨敤gzip瑙e帇缂╅潤鎬佹枃浠 - new CompressionPlugin({ - cache: false, // 涓嶅惎鐢ㄦ枃浠剁紦瀛 - test: /\.(js|css|html|jpe?g|png|gif|svg)?$/i, // 鍘嬬缉鏂囦欢鏍煎紡 - filename: '[path][base].gz[query]', // 鍘嬬缉鍚庣殑鏂囦欢鍚 - algorithm: 'gzip', // 浣跨敤gzip鍘嬬缉 - minRatio: 0.8, // 鍘嬬缉姣斾緥锛屽皬浜 80% 鐨勬枃浠朵笉浼氳鍘嬬缉 - deleteOriginalAssets: false // 鍘嬬缉鍚庡垹闄ゅ師鏂囦欢 - }) - ], - }, - chainWebpack(config) { - config.plugins.delete('preload') // TODO: need test - config.plugins.delete('prefetch') // TODO: need test - - // set svg-sprite-loader - config.module - .rule('svg') - .exclude.add(resolve('src/assets/icons')) - .end() - config.module - .rule('icons') - .test(/\.svg$/) - .include.add(resolve('src/assets/icons')) - .end() - .use('svg-sprite-loader') - .loader('svg-sprite-loader') - .options({ - symbolId: 'icon-[name]' - }) - .end() - - config.when(process.env.NODE_ENV !== 'development', config => { - config - .plugin('ScriptExtHtmlWebpackPlugin') - .after('html') - .use('script-ext-html-webpack-plugin', [{ - // `runtime` must same as runtimeChunk name. default is `runtime` - inline: /runtime\..*\.js$/ - }]) - .end() - - config.optimization.splitChunks({ - chunks: 'all', - cacheGroups: { - libs: { - name: 'chunk-libs', - test: /[\\/]node_modules[\\/]/, - priority: 10, - chunks: 'initial' // only package third parties that are initially dependent - }, - elementUI: { - name: 'chunk-elementUI', // split elementUI into a single package - test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm - priority: 20 // the weight needs to be larger than libs and app or it will be packaged into libs or app - }, - commons: { - name: 'chunk-commons', - test: resolve('src/components'), // can customize your rules - minChunks: 3, // minimum common number - priority: 5, - reuseExistingChunk: true - } - } - }) - config.optimization.runtimeChunk('single') - }) - } -} diff --git a/ry.bat b/ry.bat deleted file mode 100644 index ac1e437..0000000 --- a/ry.bat +++ /dev/null @@ -1,67 +0,0 @@ -@echo off - -rem jar平级目录 -set AppName=ruoyi-admin.jar - -rem JVM参数 -set JVM_OPTS="-Dname=%AppName% -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC" - - -ECHO. - ECHO. [1] 启动%AppName% - ECHO. [2] 关闭%AppName% - ECHO. [3] 重启%AppName% - ECHO. [4] 启动状态 %AppName% - ECHO. [5] 退 出 -ECHO. - -ECHO.请输入选择项目的序号: -set /p ID= - IF "%id%"=="1" GOTO start - IF "%id%"=="2" GOTO stop - IF "%id%"=="3" GOTO restart - IF "%id%"=="4" GOTO status - IF "%id%"=="5" EXIT -PAUSE -:start - for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do ( - set pid=%%a - set image_name=%%b - ) - if defined pid ( - echo %%is running - PAUSE - ) - -start javaw %JVM_OPTS% -jar %AppName% - -echo starting…… -echo Start %AppName% success... -goto:eof - -rem 函数stop通过jps命令查找pid并结束进程 -:stop - for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do ( - set pid=%%a - set image_name=%%b - ) - if not defined pid (echo process %AppName% does not exists) else ( - echo prepare to kill %image_name% - echo start kill %pid% ... - rem 根据进程ID,kill进程 - taskkill /f /pid %pid% - ) -goto:eof -:restart - call :stop - call :start -goto:eof -:status - for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do ( - set pid=%%a - set image_name=%%b - ) - if not defined pid (echo process %AppName% is dead ) else ( - echo %image_name% is running - ) -goto:eof diff --git a/ry.sh b/ry.sh deleted file mode 100644 index d6a9cf3..0000000 --- a/ry.sh +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/sh -# ./ry.sh start 鍚姩 stop 鍋滄 restart 閲嶅惎 status 鐘舵 -AppName=ruoyi-admin.jar - -# JVM鍙傛暟 -JVM_OPTS="-Dname=$AppName -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC" -APP_HOME=`pwd` -LOG_PATH=$APP_HOME/logs/$AppName.log - -if [ "$1" = "" ]; -then - echo -e "\033[0;31m 鏈緭鍏ユ搷浣滃悕 \033[0m \033[0;34m {start|stop|restart|status} \033[0m" - exit 1 -fi - -if [ "$AppName" = "" ]; -then - echo -e "\033[0;31m 鏈緭鍏ュ簲鐢ㄥ悕 \033[0m" - exit 1 -fi - -function start() -{ - PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'` - - if [ x"$PID" != x"" ]; then - echo "$AppName is running..." - else - nohup java $JVM_OPTS -jar $AppName > /dev/null 2>&1 & - echo "Start $AppName success..." - fi -} - -function stop() -{ - echo "Stop $AppName" - - PID="" - query(){ - PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'` - } - - query - if [ x"$PID" != x"" ]; then - kill -TERM $PID - echo "$AppName (pid:$PID) exiting..." - while [ x"$PID" != x"" ] - do - sleep 1 - query - done - echo "$AppName exited." - else - echo "$AppName already stopped." - fi -} - -function restart() -{ - stop - sleep 2 - start -} - -function status() -{ - PID=`ps -ef |grep java|grep $AppName|grep -v grep|wc -l` - if [ $PID != 0 ];then - echo "$AppName is running..." - else - echo "$AppName is not running..." - fi -} - -case $1 in - start) - start;; - stop) - stop;; - restart) - restart;; - status) - status;; - *) - -esac diff --git a/sql/quartz.sql b/sql/quartz.sql deleted file mode 100644 index cee613b..0000000 --- a/sql/quartz.sql +++ /dev/null @@ -1,174 +0,0 @@ -DROP TABLE IF EXISTS QRTZ_FIRED_TRIGGERS; -DROP TABLE IF EXISTS QRTZ_PAUSED_TRIGGER_GRPS; -DROP TABLE IF EXISTS QRTZ_SCHEDULER_STATE; -DROP TABLE IF EXISTS QRTZ_LOCKS; -DROP TABLE IF EXISTS QRTZ_SIMPLE_TRIGGERS; -DROP TABLE IF EXISTS QRTZ_SIMPROP_TRIGGERS; -DROP TABLE IF EXISTS QRTZ_CRON_TRIGGERS; -DROP TABLE IF EXISTS QRTZ_BLOB_TRIGGERS; -DROP TABLE IF EXISTS QRTZ_TRIGGERS; -DROP TABLE IF EXISTS QRTZ_JOB_DETAILS; -DROP TABLE IF EXISTS QRTZ_CALENDARS; - --- ---------------------------- --- 1銆佸瓨鍌ㄦ瘡涓涓凡閰嶇疆鐨 jobDetail 鐨勮缁嗕俊鎭 --- ---------------------------- -create table QRTZ_JOB_DETAILS ( - sched_name varchar(120) not null comment '璋冨害鍚嶇О', - job_name varchar(200) not null comment '浠诲姟鍚嶇О', - job_group varchar(200) not null comment '浠诲姟缁勫悕', - description varchar(250) null comment '鐩稿叧浠嬬粛', - job_class_name varchar(250) not null comment '鎵ц浠诲姟绫诲悕绉', - is_durable varchar(1) not null comment '鏄惁鎸佷箙鍖', - is_nonconcurrent varchar(1) not null comment '鏄惁骞跺彂', - is_update_data varchar(1) not null comment '鏄惁鏇存柊鏁版嵁', - requests_recovery varchar(1) not null comment '鏄惁鎺ュ彈鎭㈠鎵ц', - job_data blob null comment '瀛樻斁鎸佷箙鍖杍ob瀵硅薄', - primary key (sched_name, job_name, job_group) -) engine=innodb comment = '浠诲姟璇︾粏淇℃伅琛'; - --- ---------------------------- --- 2銆 瀛樺偍宸查厤缃殑 Trigger 鐨勪俊鎭 --- ---------------------------- -create table QRTZ_TRIGGERS ( - sched_name varchar(120) not null comment '璋冨害鍚嶇О', - trigger_name varchar(200) not null comment '瑙﹀彂鍣ㄧ殑鍚嶅瓧', - trigger_group varchar(200) not null comment '瑙﹀彂鍣ㄦ墍灞炵粍鐨勫悕瀛', - job_name varchar(200) not null comment 'qrtz_job_details琛╦ob_name鐨勫閿', - job_group varchar(200) not null comment 'qrtz_job_details琛╦ob_group鐨勫閿', - description varchar(250) null comment '鐩稿叧浠嬬粛', - next_fire_time bigint(13) null comment '涓婁竴娆¤Е鍙戞椂闂达紙姣锛', - prev_fire_time bigint(13) null comment '涓嬩竴娆¤Е鍙戞椂闂达紙榛樿涓-1琛ㄧず涓嶈Е鍙戯級', - priority integer null comment '浼樺厛绾', - trigger_state varchar(16) not null comment '瑙﹀彂鍣ㄧ姸鎬', - trigger_type varchar(8) not null comment '瑙﹀彂鍣ㄧ殑绫诲瀷', - start_time bigint(13) not null comment '寮濮嬫椂闂', - end_time bigint(13) null comment '缁撴潫鏃堕棿', - calendar_name varchar(200) null comment '鏃ョ▼琛ㄥ悕绉', - misfire_instr smallint(2) null comment '琛ュ伩鎵ц鐨勭瓥鐣', - job_data blob null comment '瀛樻斁鎸佷箙鍖杍ob瀵硅薄', - primary key (sched_name, trigger_name, trigger_group), - foreign key (sched_name, job_name, job_group) references QRTZ_JOB_DETAILS(sched_name, job_name, job_group) -) engine=innodb comment = '瑙﹀彂鍣ㄨ缁嗕俊鎭〃'; - --- ---------------------------- --- 3銆 瀛樺偍绠鍗曠殑 Trigger锛屽寘鎷噸澶嶆鏁帮紝闂撮殧锛屼互鍙婂凡瑙﹀彂鐨勬鏁 --- ---------------------------- -create table QRTZ_SIMPLE_TRIGGERS ( - sched_name varchar(120) not null comment '璋冨害鍚嶇О', - trigger_name varchar(200) not null comment 'qrtz_triggers琛╰rigger_name鐨勫閿', - trigger_group varchar(200) not null comment 'qrtz_triggers琛╰rigger_group鐨勫閿', - repeat_count bigint(7) not null comment '閲嶅鐨勬鏁扮粺璁', - repeat_interval bigint(12) not null comment '閲嶅鐨勯棿闅旀椂闂', - times_triggered bigint(10) not null comment '宸茬粡瑙﹀彂鐨勬鏁', - primary key (sched_name, trigger_name, trigger_group), - foreign key (sched_name, trigger_name, trigger_group) references QRTZ_TRIGGERS(sched_name, trigger_name, trigger_group) -) engine=innodb comment = '绠鍗曡Е鍙戝櫒鐨勪俊鎭〃'; - --- ---------------------------- --- 4銆 瀛樺偍 Cron Trigger锛屽寘鎷 Cron 琛ㄨ揪寮忓拰鏃跺尯淇℃伅 --- ---------------------------- -create table QRTZ_CRON_TRIGGERS ( - sched_name varchar(120) not null comment '璋冨害鍚嶇О', - trigger_name varchar(200) not null comment 'qrtz_triggers琛╰rigger_name鐨勫閿', - trigger_group varchar(200) not null comment 'qrtz_triggers琛╰rigger_group鐨勫閿', - cron_expression varchar(200) not null comment 'cron琛ㄨ揪寮', - time_zone_id varchar(80) comment '鏃跺尯', - primary key (sched_name, trigger_name, trigger_group), - foreign key (sched_name, trigger_name, trigger_group) references QRTZ_TRIGGERS(sched_name, trigger_name, trigger_group) -) engine=innodb comment = 'Cron绫诲瀷鐨勮Е鍙戝櫒琛'; - --- ---------------------------- --- 5銆 Trigger 浣滀负 Blob 绫诲瀷瀛樺偍(鐢ㄤ簬 Quartz 鐢ㄦ埛鐢 JDBC 鍒涘缓浠栦滑鑷繁瀹氬埗鐨 Trigger 绫诲瀷锛孞obStore 骞朵笉鐭ラ亾濡備綍瀛樺偍瀹炰緥鐨勬椂鍊) --- ---------------------------- -create table QRTZ_BLOB_TRIGGERS ( - sched_name varchar(120) not null comment '璋冨害鍚嶇О', - trigger_name varchar(200) not null comment 'qrtz_triggers琛╰rigger_name鐨勫閿', - trigger_group varchar(200) not null comment 'qrtz_triggers琛╰rigger_group鐨勫閿', - blob_data blob null comment '瀛樻斁鎸佷箙鍖朤rigger瀵硅薄', - primary key (sched_name, trigger_name, trigger_group), - foreign key (sched_name, trigger_name, trigger_group) references QRTZ_TRIGGERS(sched_name, trigger_name, trigger_group) -) engine=innodb comment = 'Blob绫诲瀷鐨勮Е鍙戝櫒琛'; - --- ---------------------------- --- 6銆 浠 Blob 绫诲瀷瀛樺偍瀛樻斁鏃ュ巻淇℃伅锛 quartz鍙厤缃竴涓棩鍘嗘潵鎸囧畾涓涓椂闂磋寖鍥 --- ---------------------------- -create table QRTZ_CALENDARS ( - sched_name varchar(120) not null comment '璋冨害鍚嶇О', - calendar_name varchar(200) not null comment '鏃ュ巻鍚嶇О', - calendar blob not null comment '瀛樻斁鎸佷箙鍖朿alendar瀵硅薄', - primary key (sched_name, calendar_name) -) engine=innodb comment = '鏃ュ巻淇℃伅琛'; - --- ---------------------------- --- 7銆 瀛樺偍宸叉殏鍋滅殑 Trigger 缁勭殑淇℃伅 --- ---------------------------- -create table QRTZ_PAUSED_TRIGGER_GRPS ( - sched_name varchar(120) not null comment '璋冨害鍚嶇О', - trigger_group varchar(200) not null comment 'qrtz_triggers琛╰rigger_group鐨勫閿', - primary key (sched_name, trigger_group) -) engine=innodb comment = '鏆傚仠鐨勮Е鍙戝櫒琛'; - --- ---------------------------- --- 8銆 瀛樺偍涓庡凡瑙﹀彂鐨 Trigger 鐩稿叧鐨勭姸鎬佷俊鎭紝浠ュ強鐩歌仈 Job 鐨勬墽琛屼俊鎭 --- ---------------------------- -create table QRTZ_FIRED_TRIGGERS ( - sched_name varchar(120) not null comment '璋冨害鍚嶇О', - entry_id varchar(95) not null comment '璋冨害鍣ㄥ疄渚媔d', - trigger_name varchar(200) not null comment 'qrtz_triggers琛╰rigger_name鐨勫閿', - trigger_group varchar(200) not null comment 'qrtz_triggers琛╰rigger_group鐨勫閿', - instance_name varchar(200) not null comment '璋冨害鍣ㄥ疄渚嬪悕', - fired_time bigint(13) not null comment '瑙﹀彂鐨勬椂闂', - sched_time bigint(13) not null comment '瀹氭椂鍣ㄥ埗瀹氱殑鏃堕棿', - priority integer not null comment '浼樺厛绾', - state varchar(16) not null comment '鐘舵', - job_name varchar(200) null comment '浠诲姟鍚嶇О', - job_group varchar(200) null comment '浠诲姟缁勫悕', - is_nonconcurrent varchar(1) null comment '鏄惁骞跺彂', - requests_recovery varchar(1) null comment '鏄惁鎺ュ彈鎭㈠鎵ц', - primary key (sched_name, entry_id) -) engine=innodb comment = '宸茶Е鍙戠殑瑙﹀彂鍣ㄨ〃'; - --- ---------------------------- --- 9銆 瀛樺偍灏戦噺鐨勬湁鍏 Scheduler 鐨勭姸鎬佷俊鎭紝鍋囧鏄敤浜庨泦缇や腑锛屽彲浠ョ湅鍒板叾浠栫殑 Scheduler 瀹炰緥 --- ---------------------------- -create table QRTZ_SCHEDULER_STATE ( - sched_name varchar(120) not null comment '璋冨害鍚嶇О', - instance_name varchar(200) not null comment '瀹炰緥鍚嶇О', - last_checkin_time bigint(13) not null comment '涓婃妫鏌ユ椂闂', - checkin_interval bigint(13) not null comment '妫鏌ラ棿闅旀椂闂', - primary key (sched_name, instance_name) -) engine=innodb comment = '璋冨害鍣ㄧ姸鎬佽〃'; - --- ---------------------------- --- 10銆 瀛樺偍绋嬪簭鐨勬偛瑙傞攣鐨勪俊鎭(鍋囧浣跨敤浜嗘偛瑙傞攣) --- ---------------------------- -create table QRTZ_LOCKS ( - sched_name varchar(120) not null comment '璋冨害鍚嶇О', - lock_name varchar(40) not null comment '鎮茶閿佸悕绉', - primary key (sched_name, lock_name) -) engine=innodb comment = '瀛樺偍鐨勬偛瑙傞攣淇℃伅琛'; - --- ---------------------------- --- 11銆 Quartz闆嗙兢瀹炵幇鍚屾鏈哄埗鐨勮閿佽〃 --- ---------------------------- -create table QRTZ_SIMPROP_TRIGGERS ( - sched_name varchar(120) not null comment '璋冨害鍚嶇О', - trigger_name varchar(200) not null comment 'qrtz_triggers琛╰rigger_name鐨勫閿', - trigger_group varchar(200) not null comment 'qrtz_triggers琛╰rigger_group鐨勫閿', - str_prop_1 varchar(512) null comment 'String绫诲瀷鐨則rigger鐨勭涓涓弬鏁', - str_prop_2 varchar(512) null comment 'String绫诲瀷鐨則rigger鐨勭浜屼釜鍙傛暟', - str_prop_3 varchar(512) null comment 'String绫诲瀷鐨則rigger鐨勭涓変釜鍙傛暟', - int_prop_1 int null comment 'int绫诲瀷鐨則rigger鐨勭涓涓弬鏁', - int_prop_2 int null comment 'int绫诲瀷鐨則rigger鐨勭浜屼釜鍙傛暟', - long_prop_1 bigint null comment 'long绫诲瀷鐨則rigger鐨勭涓涓弬鏁', - long_prop_2 bigint null comment 'long绫诲瀷鐨則rigger鐨勭浜屼釜鍙傛暟', - dec_prop_1 numeric(13,4) null comment 'decimal绫诲瀷鐨則rigger鐨勭涓涓弬鏁', - dec_prop_2 numeric(13,4) null comment 'decimal绫诲瀷鐨則rigger鐨勭浜屼釜鍙傛暟', - bool_prop_1 varchar(1) null comment 'Boolean绫诲瀷鐨則rigger鐨勭涓涓弬鏁', - bool_prop_2 varchar(1) null comment 'Boolean绫诲瀷鐨則rigger鐨勭浜屼釜鍙傛暟', - primary key (sched_name, trigger_name, trigger_group), - foreign key (sched_name, trigger_name, trigger_group) references QRTZ_TRIGGERS(sched_name, trigger_name, trigger_group) -) engine=innodb comment = '鍚屾鏈哄埗鐨勮閿佽〃'; - -commit; \ No newline at end of file diff --git a/sql/ry_20231130.sql b/sql/ry_20231130.sql deleted file mode 100644 index 452c2fc..0000000 --- a/sql/ry_20231130.sql +++ /dev/null @@ -1,700 +0,0 @@ --- ---------------------------- --- 1銆侀儴闂ㄨ〃 --- ---------------------------- -drop table if exists sys_dept; -create table sys_dept ( - dept_id bigint(20) not null auto_increment comment '閮ㄩ棬id', - parent_id bigint(20) default 0 comment '鐖堕儴闂╥d', - ancestors varchar(50) default '' comment '绁栫骇鍒楄〃', - dept_name varchar(30) default '' comment '閮ㄩ棬鍚嶇О', - order_num int(4) default 0 comment '鏄剧ず椤哄簭', - leader varchar(20) default null comment '璐熻矗浜', - phone varchar(11) default null comment '鑱旂郴鐢佃瘽', - email varchar(50) default null comment '閭', - status char(1) default '0' comment '閮ㄩ棬鐘舵侊紙0姝e父 1鍋滅敤锛', - del_flag char(1) default '0' comment '鍒犻櫎鏍囧織锛0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛', - create_by varchar(64) default '' comment '鍒涘缓鑰', - create_time datetime comment '鍒涘缓鏃堕棿', - update_by varchar(64) default '' comment '鏇存柊鑰', - update_time datetime comment '鏇存柊鏃堕棿', - primary key (dept_id) -) engine=innodb auto_increment=200 comment = '閮ㄩ棬琛'; - --- ---------------------------- --- 鍒濆鍖-閮ㄩ棬琛ㄦ暟鎹 --- ---------------------------- -insert into sys_dept values(100, 0, '0', '鑻ヤ緷绉戞妧', 0, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(101, 100, '0,100', '娣卞湷鎬诲叕鍙', 1, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(102, 100, '0,100', '闀挎矙鍒嗗叕鍙', 2, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(103, 101, '0,100,101', '鐮斿彂閮ㄩ棬', 1, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(104, 101, '0,100,101', '甯傚満閮ㄩ棬', 2, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(105, 101, '0,100,101', '娴嬭瘯閮ㄩ棬', 3, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(106, 101, '0,100,101', '璐㈠姟閮ㄩ棬', 4, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(107, 101, '0,100,101', '杩愮淮閮ㄩ棬', 5, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(108, 102, '0,100,102', '甯傚満閮ㄩ棬', 1, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(109, 102, '0,100,102', '璐㈠姟閮ㄩ棬', 2, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); - - --- ---------------------------- --- 2銆佺敤鎴蜂俊鎭〃 --- ---------------------------- -drop table if exists sys_user; -create table sys_user ( - user_id bigint(20) not null auto_increment comment '鐢ㄦ埛ID', - dept_id bigint(20) default null comment '閮ㄩ棬ID', - user_name varchar(30) not null comment '鐢ㄦ埛璐﹀彿', - nick_name varchar(30) not null comment '鐢ㄦ埛鏄电О', - user_type varchar(2) default '00' comment '鐢ㄦ埛绫诲瀷锛00绯荤粺鐢ㄦ埛锛', - email varchar(50) default '' comment '鐢ㄦ埛閭', - phonenumber varchar(11) default '' comment '鎵嬫満鍙风爜', - sex char(1) default '0' comment '鐢ㄦ埛鎬у埆锛0鐢 1濂 2鏈煡锛', - avatar varchar(100) default '' comment '澶村儚鍦板潃', - password varchar(100) default '' comment '瀵嗙爜', - status char(1) default '0' comment '甯愬彿鐘舵侊紙0姝e父 1鍋滅敤锛', - del_flag char(1) default '0' comment '鍒犻櫎鏍囧織锛0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛', - login_ip varchar(128) default '' comment '鏈鍚庣櫥褰旾P', - login_date datetime comment '鏈鍚庣櫥褰曟椂闂', - create_by varchar(64) default '' comment '鍒涘缓鑰', - create_time datetime comment '鍒涘缓鏃堕棿', - update_by varchar(64) default '' comment '鏇存柊鑰', - update_time datetime comment '鏇存柊鏃堕棿', - remark varchar(500) default null comment '澶囨敞', - primary key (user_id) -) engine=innodb auto_increment=100 comment = '鐢ㄦ埛淇℃伅琛'; - --- ---------------------------- --- 鍒濆鍖-鐢ㄦ埛淇℃伅琛ㄦ暟鎹 --- ---------------------------- -insert into sys_user values(1, 103, 'admin', '鑻ヤ緷', '00', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '绠$悊鍛'); -insert into sys_user values(2, 105, 'ry', '鑻ヤ緷', '00', 'ry@qq.com', '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '娴嬭瘯鍛'); - - --- ---------------------------- --- 3銆佸矖浣嶄俊鎭〃 --- ---------------------------- -drop table if exists sys_post; -create table sys_post -( - post_id bigint(20) not null auto_increment comment '宀椾綅ID', - post_code varchar(64) not null comment '宀椾綅缂栫爜', - post_name varchar(50) not null comment '宀椾綅鍚嶇О', - post_sort int(4) not null comment '鏄剧ず椤哄簭', - status char(1) not null comment '鐘舵侊紙0姝e父 1鍋滅敤锛', - create_by varchar(64) default '' comment '鍒涘缓鑰', - create_time datetime comment '鍒涘缓鏃堕棿', - update_by varchar(64) default '' comment '鏇存柊鑰', - update_time datetime comment '鏇存柊鏃堕棿', - remark varchar(500) default null comment '澶囨敞', - primary key (post_id) -) engine=innodb comment = '宀椾綅淇℃伅琛'; - --- ---------------------------- --- 鍒濆鍖-宀椾綅淇℃伅琛ㄦ暟鎹 --- ---------------------------- -insert into sys_post values(1, 'ceo', '钁d簨闀', 1, '0', 'admin', sysdate(), '', null, ''); -insert into sys_post values(2, 'se', '椤圭洰缁忕悊', 2, '0', 'admin', sysdate(), '', null, ''); -insert into sys_post values(3, 'hr', '浜哄姏璧勬簮', 3, '0', 'admin', sysdate(), '', null, ''); -insert into sys_post values(4, 'user', '鏅氬憳宸', 4, '0', 'admin', sysdate(), '', null, ''); - - --- ---------------------------- --- 4銆佽鑹蹭俊鎭〃 --- ---------------------------- -drop table if exists sys_role; -create table sys_role ( - role_id bigint(20) not null auto_increment comment '瑙掕壊ID', - role_name varchar(30) not null comment '瑙掕壊鍚嶇О', - role_key varchar(100) not null comment '瑙掕壊鏉冮檺瀛楃涓', - role_sort int(4) not null comment '鏄剧ず椤哄簭', - data_scope char(1) default '1' comment '鏁版嵁鑼冨洿锛1锛氬叏閮ㄦ暟鎹潈闄 2锛氳嚜瀹氭暟鎹潈闄 3锛氭湰閮ㄩ棬鏁版嵁鏉冮檺 4锛氭湰閮ㄩ棬鍙婁互涓嬫暟鎹潈闄愶級', - menu_check_strictly tinyint(1) default 1 comment '鑿滃崟鏍戦夋嫨椤规槸鍚﹀叧鑱旀樉绀', - dept_check_strictly tinyint(1) default 1 comment '閮ㄩ棬鏍戦夋嫨椤规槸鍚﹀叧鑱旀樉绀', - status char(1) not null comment '瑙掕壊鐘舵侊紙0姝e父 1鍋滅敤锛', - del_flag char(1) default '0' comment '鍒犻櫎鏍囧織锛0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛', - create_by varchar(64) default '' comment '鍒涘缓鑰', - create_time datetime comment '鍒涘缓鏃堕棿', - update_by varchar(64) default '' comment '鏇存柊鑰', - update_time datetime comment '鏇存柊鏃堕棿', - remark varchar(500) default null comment '澶囨敞', - primary key (role_id) -) engine=innodb auto_increment=100 comment = '瑙掕壊淇℃伅琛'; - --- ---------------------------- --- 鍒濆鍖-瑙掕壊淇℃伅琛ㄦ暟鎹 --- ---------------------------- -insert into sys_role values('1', '瓒呯骇绠$悊鍛', 'admin', 1, 1, 1, 1, '0', '0', 'admin', sysdate(), '', null, '瓒呯骇绠$悊鍛'); -insert into sys_role values('2', '鏅氳鑹', 'common', 2, 2, 1, 1, '0', '0', 'admin', sysdate(), '', null, '鏅氳鑹'); - - --- ---------------------------- --- 5銆佽彍鍗曟潈闄愯〃 --- ---------------------------- -drop table if exists sys_menu; -create table sys_menu ( - menu_id bigint(20) not null auto_increment comment '鑿滃崟ID', - menu_name varchar(50) not null comment '鑿滃崟鍚嶇О', - parent_id bigint(20) default 0 comment '鐖惰彍鍗旾D', - order_num int(4) default 0 comment '鏄剧ず椤哄簭', - path varchar(200) default '' comment '璺敱鍦板潃', - component varchar(255) default null comment '缁勪欢璺緞', - query varchar(255) default null comment '璺敱鍙傛暟', - is_frame int(1) default 1 comment '鏄惁涓哄閾撅紙0鏄 1鍚︼級', - is_cache int(1) default 0 comment '鏄惁缂撳瓨锛0缂撳瓨 1涓嶇紦瀛橈級', - menu_type char(1) default '' comment '鑿滃崟绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛', - visible char(1) default 0 comment '鑿滃崟鐘舵侊紙0鏄剧ず 1闅愯棌锛', - status char(1) default 0 comment '鑿滃崟鐘舵侊紙0姝e父 1鍋滅敤锛', - perms varchar(100) default null comment '鏉冮檺鏍囪瘑', - icon varchar(100) default '#' comment '鑿滃崟鍥炬爣', - create_by varchar(64) default '' comment '鍒涘缓鑰', - create_time datetime comment '鍒涘缓鏃堕棿', - update_by varchar(64) default '' comment '鏇存柊鑰', - update_time datetime comment '鏇存柊鏃堕棿', - remark varchar(500) default '' comment '澶囨敞', - primary key (menu_id) -) engine=innodb auto_increment=2000 comment = '鑿滃崟鏉冮檺琛'; - --- ---------------------------- --- 鍒濆鍖-鑿滃崟淇℃伅琛ㄦ暟鎹 --- ---------------------------- --- 涓绾ц彍鍗 -insert into sys_menu values('1', '绯荤粺绠$悊', '0', '1', 'system', null, '', 1, 0, 'M', '0', '0', '', 'system', 'admin', sysdate(), '', null, '绯荤粺绠$悊鐩綍'); -insert into sys_menu values('2', '绯荤粺鐩戞帶', '0', '2', 'monitor', null, '', 1, 0, 'M', '0', '0', '', 'monitor', 'admin', sysdate(), '', null, '绯荤粺鐩戞帶鐩綍'); -insert into sys_menu values('3', '绯荤粺宸ュ叿', '0', '3', 'tool', null, '', 1, 0, 'M', '0', '0', '', 'tool', 'admin', sysdate(), '', null, '绯荤粺宸ュ叿鐩綍'); -insert into sys_menu values('4', '鑻ヤ緷瀹樼綉', '0', '4', 'http://ruoyi.vip', null, '', 0, 0, 'M', '0', '0', '', 'guide', 'admin', sysdate(), '', null, '鑻ヤ緷瀹樼綉鍦板潃'); --- 浜岀骇鑿滃崟 -insert into sys_menu values('100', '鐢ㄦ埛绠$悊', '1', '1', 'user', 'system/user/index', '', 1, 0, 'C', '0', '0', 'system:user:list', 'user', 'admin', sysdate(), '', null, '鐢ㄦ埛绠$悊鑿滃崟'); -insert into sys_menu values('101', '瑙掕壊绠$悊', '1', '2', 'role', 'system/role/index', '', 1, 0, 'C', '0', '0', 'system:role:list', 'peoples', 'admin', sysdate(), '', null, '瑙掕壊绠$悊鑿滃崟'); -insert into sys_menu values('102', '鑿滃崟绠$悊', '1', '3', 'menu', 'system/menu/index', '', 1, 0, 'C', '0', '0', 'system:menu:list', 'tree-table', 'admin', sysdate(), '', null, '鑿滃崟绠$悊鑿滃崟'); -insert into sys_menu values('103', '閮ㄩ棬绠$悊', '1', '4', 'dept', 'system/dept/index', '', 1, 0, 'C', '0', '0', 'system:dept:list', 'tree', 'admin', sysdate(), '', null, '閮ㄩ棬绠$悊鑿滃崟'); -insert into sys_menu values('104', '宀椾綅绠$悊', '1', '5', 'post', 'system/post/index', '', 1, 0, 'C', '0', '0', 'system:post:list', 'post', 'admin', sysdate(), '', null, '宀椾綅绠$悊鑿滃崟'); -insert into sys_menu values('105', '瀛楀吀绠$悊', '1', '6', 'dict', 'system/dict/index', '', 1, 0, 'C', '0', '0', 'system:dict:list', 'dict', 'admin', sysdate(), '', null, '瀛楀吀绠$悊鑿滃崟'); -insert into sys_menu values('106', '鍙傛暟璁剧疆', '1', '7', 'config', 'system/config/index', '', 1, 0, 'C', '0', '0', 'system:config:list', 'edit', 'admin', sysdate(), '', null, '鍙傛暟璁剧疆鑿滃崟'); -insert into sys_menu values('107', '閫氱煡鍏憡', '1', '8', 'notice', 'system/notice/index', '', 1, 0, 'C', '0', '0', 'system:notice:list', 'message', 'admin', sysdate(), '', null, '閫氱煡鍏憡鑿滃崟'); -insert into sys_menu values('108', '鏃ュ織绠$悊', '1', '9', 'log', '', '', 1, 0, 'M', '0', '0', '', 'log', 'admin', sysdate(), '', null, '鏃ュ織绠$悊鑿滃崟'); -insert into sys_menu values('109', '鍦ㄧ嚎鐢ㄦ埛', '2', '1', 'online', 'monitor/online/index', '', 1, 0, 'C', '0', '0', 'monitor:online:list', 'online', 'admin', sysdate(), '', null, '鍦ㄧ嚎鐢ㄦ埛鑿滃崟'); -insert into sys_menu values('110', '瀹氭椂浠诲姟', '2', '2', 'job', 'monitor/job/index', '', 1, 0, 'C', '0', '0', 'monitor:job:list', 'job', 'admin', sysdate(), '', null, '瀹氭椂浠诲姟鑿滃崟'); -insert into sys_menu values('111', '鏁版嵁鐩戞帶', '2', '3', 'druid', 'monitor/druid/index', '', 1, 0, 'C', '0', '0', 'monitor:druid:list', 'druid', 'admin', sysdate(), '', null, '鏁版嵁鐩戞帶鑿滃崟'); -insert into sys_menu values('112', '鏈嶅姟鐩戞帶', '2', '4', 'server', 'monitor/server/index', '', 1, 0, 'C', '0', '0', 'monitor:server:list', 'server', 'admin', sysdate(), '', null, '鏈嶅姟鐩戞帶鑿滃崟'); -insert into sys_menu values('113', '缂撳瓨鐩戞帶', '2', '5', 'cache', 'monitor/cache/index', '', 1, 0, 'C', '0', '0', 'monitor:cache:list', 'redis', 'admin', sysdate(), '', null, '缂撳瓨鐩戞帶鑿滃崟'); -insert into sys_menu values('114', '缂撳瓨鍒楄〃', '2', '6', 'cacheList', 'monitor/cache/list', '', 1, 0, 'C', '0', '0', 'monitor:cache:list', 'redis-list', 'admin', sysdate(), '', null, '缂撳瓨鍒楄〃鑿滃崟'); -insert into sys_menu values('115', '琛ㄥ崟鏋勫缓', '3', '1', 'build', 'tool/build/index', '', 1, 0, 'C', '0', '0', 'tool:build:list', 'build', 'admin', sysdate(), '', null, '琛ㄥ崟鏋勫缓鑿滃崟'); -insert into sys_menu values('116', '浠g爜鐢熸垚', '3', '2', 'gen', 'tool/gen/index', '', 1, 0, 'C', '0', '0', 'tool:gen:list', 'code', 'admin', sysdate(), '', null, '浠g爜鐢熸垚鑿滃崟'); -insert into sys_menu values('117', '绯荤粺鎺ュ彛', '3', '3', 'swagger', 'tool/swagger/index', '', 1, 0, 'C', '0', '0', 'tool:swagger:list', 'swagger', 'admin', sysdate(), '', null, '绯荤粺鎺ュ彛鑿滃崟'); --- 涓夌骇鑿滃崟 -insert into sys_menu values('500', '鎿嶄綔鏃ュ織', '108', '1', 'operlog', 'monitor/operlog/index', '', 1, 0, 'C', '0', '0', 'monitor:operlog:list', 'form', 'admin', sysdate(), '', null, '鎿嶄綔鏃ュ織鑿滃崟'); -insert into sys_menu values('501', '鐧诲綍鏃ュ織', '108', '2', 'logininfor', 'monitor/logininfor/index', '', 1, 0, 'C', '0', '0', 'monitor:logininfor:list', 'logininfor', 'admin', sysdate(), '', null, '鐧诲綍鏃ュ織鑿滃崟'); --- 鐢ㄦ埛绠$悊鎸夐挳 -insert into sys_menu values('1000', '鐢ㄦ埛鏌ヨ', '100', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:user:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1001', '鐢ㄦ埛鏂板', '100', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:user:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1002', '鐢ㄦ埛淇敼', '100', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:user:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1003', '鐢ㄦ埛鍒犻櫎', '100', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:user:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1004', '鐢ㄦ埛瀵煎嚭', '100', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:user:export', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1005', '鐢ㄦ埛瀵煎叆', '100', '6', '', '', '', 1, 0, 'F', '0', '0', 'system:user:import', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1006', '閲嶇疆瀵嗙爜', '100', '7', '', '', '', 1, 0, 'F', '0', '0', 'system:user:resetPwd', '#', 'admin', sysdate(), '', null, ''); --- 瑙掕壊绠$悊鎸夐挳 -insert into sys_menu values('1007', '瑙掕壊鏌ヨ', '101', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:role:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1008', '瑙掕壊鏂板', '101', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:role:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1009', '瑙掕壊淇敼', '101', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:role:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1010', '瑙掕壊鍒犻櫎', '101', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:role:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1011', '瑙掕壊瀵煎嚭', '101', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:role:export', '#', 'admin', sysdate(), '', null, ''); --- 鑿滃崟绠$悊鎸夐挳 -insert into sys_menu values('1012', '鑿滃崟鏌ヨ', '102', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1013', '鑿滃崟鏂板', '102', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1014', '鑿滃崟淇敼', '102', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1015', '鑿滃崟鍒犻櫎', '102', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:remove', '#', 'admin', sysdate(), '', null, ''); --- 閮ㄩ棬绠$悊鎸夐挳 -insert into sys_menu values('1016', '閮ㄩ棬鏌ヨ', '103', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1017', '閮ㄩ棬鏂板', '103', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1018', '閮ㄩ棬淇敼', '103', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1019', '閮ㄩ棬鍒犻櫎', '103', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:remove', '#', 'admin', sysdate(), '', null, ''); --- 宀椾綅绠$悊鎸夐挳 -insert into sys_menu values('1020', '宀椾綅鏌ヨ', '104', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:post:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1021', '宀椾綅鏂板', '104', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:post:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1022', '宀椾綅淇敼', '104', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:post:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1023', '宀椾綅鍒犻櫎', '104', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:post:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1024', '宀椾綅瀵煎嚭', '104', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:post:export', '#', 'admin', sysdate(), '', null, ''); --- 瀛楀吀绠$悊鎸夐挳 -insert into sys_menu values('1025', '瀛楀吀鏌ヨ', '105', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1026', '瀛楀吀鏂板', '105', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1027', '瀛楀吀淇敼', '105', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1028', '瀛楀吀鍒犻櫎', '105', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1029', '瀛楀吀瀵煎嚭', '105', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:export', '#', 'admin', sysdate(), '', null, ''); --- 鍙傛暟璁剧疆鎸夐挳 -insert into sys_menu values('1030', '鍙傛暟鏌ヨ', '106', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1031', '鍙傛暟鏂板', '106', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1032', '鍙傛暟淇敼', '106', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1033', '鍙傛暟鍒犻櫎', '106', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1034', '鍙傛暟瀵煎嚭', '106', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:export', '#', 'admin', sysdate(), '', null, ''); --- 閫氱煡鍏憡鎸夐挳 -insert into sys_menu values('1035', '鍏憡鏌ヨ', '107', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1036', '鍏憡鏂板', '107', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1037', '鍏憡淇敼', '107', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1038', '鍏憡鍒犻櫎', '107', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:remove', '#', 'admin', sysdate(), '', null, ''); --- 鎿嶄綔鏃ュ織鎸夐挳 -insert into sys_menu values('1039', '鎿嶄綔鏌ヨ', '500', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1040', '鎿嶄綔鍒犻櫎', '500', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1041', '鏃ュ織瀵煎嚭', '500', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:export', '#', 'admin', sysdate(), '', null, ''); --- 鐧诲綍鏃ュ織鎸夐挳 -insert into sys_menu values('1042', '鐧诲綍鏌ヨ', '501', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1043', '鐧诲綍鍒犻櫎', '501', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1044', '鏃ュ織瀵煎嚭', '501', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:export', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1045', '璐︽埛瑙i攣', '501', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:unlock', '#', 'admin', sysdate(), '', null, ''); --- 鍦ㄧ嚎鐢ㄦ埛鎸夐挳 -insert into sys_menu values('1046', '鍦ㄧ嚎鏌ヨ', '109', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1047', '鎵归噺寮洪', '109', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:batchLogout', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1048', '鍗曟潯寮洪', '109', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:forceLogout', '#', 'admin', sysdate(), '', null, ''); --- 瀹氭椂浠诲姟鎸夐挳 -insert into sys_menu values('1049', '浠诲姟鏌ヨ', '110', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1050', '浠诲姟鏂板', '110', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1051', '浠诲姟淇敼', '110', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1052', '浠诲姟鍒犻櫎', '110', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1053', '鐘舵佷慨鏀', '110', '5', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:changeStatus', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1054', '浠诲姟瀵煎嚭', '110', '6', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:export', '#', 'admin', sysdate(), '', null, ''); --- 浠g爜鐢熸垚鎸夐挳 -insert into sys_menu values('1055', '鐢熸垚鏌ヨ', '116', '1', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1056', '鐢熸垚淇敼', '116', '2', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1057', '鐢熸垚鍒犻櫎', '116', '3', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1058', '瀵煎叆浠g爜', '116', '4', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:import', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1059', '棰勮浠g爜', '116', '5', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:preview', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1060', '鐢熸垚浠g爜', '116', '6', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:code', '#', 'admin', sysdate(), '', null, ''); - - --- ---------------------------- --- 6銆佺敤鎴峰拰瑙掕壊鍏宠仈琛 鐢ㄦ埛N-1瑙掕壊 --- ---------------------------- -drop table if exists sys_user_role; -create table sys_user_role ( - user_id bigint(20) not null comment '鐢ㄦ埛ID', - role_id bigint(20) not null comment '瑙掕壊ID', - primary key(user_id, role_id) -) engine=innodb comment = '鐢ㄦ埛鍜岃鑹插叧鑱旇〃'; - --- ---------------------------- --- 鍒濆鍖-鐢ㄦ埛鍜岃鑹插叧鑱旇〃鏁版嵁 --- ---------------------------- -insert into sys_user_role values ('1', '1'); -insert into sys_user_role values ('2', '2'); - - --- ---------------------------- --- 7銆佽鑹插拰鑿滃崟鍏宠仈琛 瑙掕壊1-N鑿滃崟 --- ---------------------------- -drop table if exists sys_role_menu; -create table sys_role_menu ( - role_id bigint(20) not null comment '瑙掕壊ID', - menu_id bigint(20) not null comment '鑿滃崟ID', - primary key(role_id, menu_id) -) engine=innodb comment = '瑙掕壊鍜岃彍鍗曞叧鑱旇〃'; - --- ---------------------------- --- 鍒濆鍖-瑙掕壊鍜岃彍鍗曞叧鑱旇〃鏁版嵁 --- ---------------------------- -insert into sys_role_menu values ('2', '1'); -insert into sys_role_menu values ('2', '2'); -insert into sys_role_menu values ('2', '3'); -insert into sys_role_menu values ('2', '4'); -insert into sys_role_menu values ('2', '100'); -insert into sys_role_menu values ('2', '101'); -insert into sys_role_menu values ('2', '102'); -insert into sys_role_menu values ('2', '103'); -insert into sys_role_menu values ('2', '104'); -insert into sys_role_menu values ('2', '105'); -insert into sys_role_menu values ('2', '106'); -insert into sys_role_menu values ('2', '107'); -insert into sys_role_menu values ('2', '108'); -insert into sys_role_menu values ('2', '109'); -insert into sys_role_menu values ('2', '110'); -insert into sys_role_menu values ('2', '111'); -insert into sys_role_menu values ('2', '112'); -insert into sys_role_menu values ('2', '113'); -insert into sys_role_menu values ('2', '114'); -insert into sys_role_menu values ('2', '115'); -insert into sys_role_menu values ('2', '116'); -insert into sys_role_menu values ('2', '117'); -insert into sys_role_menu values ('2', '500'); -insert into sys_role_menu values ('2', '501'); -insert into sys_role_menu values ('2', '1000'); -insert into sys_role_menu values ('2', '1001'); -insert into sys_role_menu values ('2', '1002'); -insert into sys_role_menu values ('2', '1003'); -insert into sys_role_menu values ('2', '1004'); -insert into sys_role_menu values ('2', '1005'); -insert into sys_role_menu values ('2', '1006'); -insert into sys_role_menu values ('2', '1007'); -insert into sys_role_menu values ('2', '1008'); -insert into sys_role_menu values ('2', '1009'); -insert into sys_role_menu values ('2', '1010'); -insert into sys_role_menu values ('2', '1011'); -insert into sys_role_menu values ('2', '1012'); -insert into sys_role_menu values ('2', '1013'); -insert into sys_role_menu values ('2', '1014'); -insert into sys_role_menu values ('2', '1015'); -insert into sys_role_menu values ('2', '1016'); -insert into sys_role_menu values ('2', '1017'); -insert into sys_role_menu values ('2', '1018'); -insert into sys_role_menu values ('2', '1019'); -insert into sys_role_menu values ('2', '1020'); -insert into sys_role_menu values ('2', '1021'); -insert into sys_role_menu values ('2', '1022'); -insert into sys_role_menu values ('2', '1023'); -insert into sys_role_menu values ('2', '1024'); -insert into sys_role_menu values ('2', '1025'); -insert into sys_role_menu values ('2', '1026'); -insert into sys_role_menu values ('2', '1027'); -insert into sys_role_menu values ('2', '1028'); -insert into sys_role_menu values ('2', '1029'); -insert into sys_role_menu values ('2', '1030'); -insert into sys_role_menu values ('2', '1031'); -insert into sys_role_menu values ('2', '1032'); -insert into sys_role_menu values ('2', '1033'); -insert into sys_role_menu values ('2', '1034'); -insert into sys_role_menu values ('2', '1035'); -insert into sys_role_menu values ('2', '1036'); -insert into sys_role_menu values ('2', '1037'); -insert into sys_role_menu values ('2', '1038'); -insert into sys_role_menu values ('2', '1039'); -insert into sys_role_menu values ('2', '1040'); -insert into sys_role_menu values ('2', '1041'); -insert into sys_role_menu values ('2', '1042'); -insert into sys_role_menu values ('2', '1043'); -insert into sys_role_menu values ('2', '1044'); -insert into sys_role_menu values ('2', '1045'); -insert into sys_role_menu values ('2', '1046'); -insert into sys_role_menu values ('2', '1047'); -insert into sys_role_menu values ('2', '1048'); -insert into sys_role_menu values ('2', '1049'); -insert into sys_role_menu values ('2', '1050'); -insert into sys_role_menu values ('2', '1051'); -insert into sys_role_menu values ('2', '1052'); -insert into sys_role_menu values ('2', '1053'); -insert into sys_role_menu values ('2', '1054'); -insert into sys_role_menu values ('2', '1055'); -insert into sys_role_menu values ('2', '1056'); -insert into sys_role_menu values ('2', '1057'); -insert into sys_role_menu values ('2', '1058'); -insert into sys_role_menu values ('2', '1059'); -insert into sys_role_menu values ('2', '1060'); - --- ---------------------------- --- 8銆佽鑹插拰閮ㄩ棬鍏宠仈琛 瑙掕壊1-N閮ㄩ棬 --- ---------------------------- -drop table if exists sys_role_dept; -create table sys_role_dept ( - role_id bigint(20) not null comment '瑙掕壊ID', - dept_id bigint(20) not null comment '閮ㄩ棬ID', - primary key(role_id, dept_id) -) engine=innodb comment = '瑙掕壊鍜岄儴闂ㄥ叧鑱旇〃'; - --- ---------------------------- --- 鍒濆鍖-瑙掕壊鍜岄儴闂ㄥ叧鑱旇〃鏁版嵁 --- ---------------------------- -insert into sys_role_dept values ('2', '100'); -insert into sys_role_dept values ('2', '101'); -insert into sys_role_dept values ('2', '105'); - - --- ---------------------------- --- 9銆佺敤鎴蜂笌宀椾綅鍏宠仈琛 鐢ㄦ埛1-N宀椾綅 --- ---------------------------- -drop table if exists sys_user_post; -create table sys_user_post -( - user_id bigint(20) not null comment '鐢ㄦ埛ID', - post_id bigint(20) not null comment '宀椾綅ID', - primary key (user_id, post_id) -) engine=innodb comment = '鐢ㄦ埛涓庡矖浣嶅叧鑱旇〃'; - --- ---------------------------- --- 鍒濆鍖-鐢ㄦ埛涓庡矖浣嶅叧鑱旇〃鏁版嵁 --- ---------------------------- -insert into sys_user_post values ('1', '1'); -insert into sys_user_post values ('2', '2'); - - --- ---------------------------- --- 10銆佹搷浣滄棩蹇楄褰 --- ---------------------------- -drop table if exists sys_oper_log; -create table sys_oper_log ( - oper_id bigint(20) not null auto_increment comment '鏃ュ織涓婚敭', - title varchar(50) default '' comment '妯″潡鏍囬', - business_type int(2) default 0 comment '涓氬姟绫诲瀷锛0鍏跺畠 1鏂板 2淇敼 3鍒犻櫎锛', - method varchar(100) default '' comment '鏂规硶鍚嶇О', - request_method varchar(10) default '' comment '璇锋眰鏂瑰紡', - operator_type int(1) default 0 comment '鎿嶄綔绫诲埆锛0鍏跺畠 1鍚庡彴鐢ㄦ埛 2鎵嬫満绔敤鎴凤級', - oper_name varchar(50) default '' comment '鎿嶄綔浜哄憳', - dept_name varchar(50) default '' comment '閮ㄩ棬鍚嶇О', - oper_url varchar(255) default '' comment '璇锋眰URL', - oper_ip varchar(128) default '' comment '涓绘満鍦板潃', - oper_location varchar(255) default '' comment '鎿嶄綔鍦扮偣', - oper_param varchar(2000) default '' comment '璇锋眰鍙傛暟', - json_result varchar(2000) default '' comment '杩斿洖鍙傛暟', - status int(1) default 0 comment '鎿嶄綔鐘舵侊紙0姝e父 1寮傚父锛', - error_msg varchar(2000) default '' comment '閿欒娑堟伅', - oper_time datetime comment '鎿嶄綔鏃堕棿', - cost_time bigint(20) default 0 comment '娑堣楁椂闂', - primary key (oper_id), - key idx_sys_oper_log_bt (business_type), - key idx_sys_oper_log_s (status), - key idx_sys_oper_log_ot (oper_time) -) engine=innodb auto_increment=100 comment = '鎿嶄綔鏃ュ織璁板綍'; - - --- ---------------------------- --- 11銆佸瓧鍏哥被鍨嬭〃 --- ---------------------------- -drop table if exists sys_dict_type; -create table sys_dict_type -( - dict_id bigint(20) not null auto_increment comment '瀛楀吀涓婚敭', - dict_name varchar(100) default '' comment '瀛楀吀鍚嶇О', - dict_type varchar(100) default '' comment '瀛楀吀绫诲瀷', - status char(1) default '0' comment '鐘舵侊紙0姝e父 1鍋滅敤锛', - create_by varchar(64) default '' comment '鍒涘缓鑰', - create_time datetime comment '鍒涘缓鏃堕棿', - update_by varchar(64) default '' comment '鏇存柊鑰', - update_time datetime comment '鏇存柊鏃堕棿', - remark varchar(500) default null comment '澶囨敞', - primary key (dict_id), - unique (dict_type) -) engine=innodb auto_increment=100 comment = '瀛楀吀绫诲瀷琛'; - -insert into sys_dict_type values(1, '鐢ㄦ埛鎬у埆', 'sys_user_sex', '0', 'admin', sysdate(), '', null, '鐢ㄦ埛鎬у埆鍒楄〃'); -insert into sys_dict_type values(2, '鑿滃崟鐘舵', 'sys_show_hide', '0', 'admin', sysdate(), '', null, '鑿滃崟鐘舵佸垪琛'); -insert into sys_dict_type values(3, '绯荤粺寮鍏', 'sys_normal_disable', '0', 'admin', sysdate(), '', null, '绯荤粺寮鍏冲垪琛'); -insert into sys_dict_type values(4, '浠诲姟鐘舵', 'sys_job_status', '0', 'admin', sysdate(), '', null, '浠诲姟鐘舵佸垪琛'); -insert into sys_dict_type values(5, '浠诲姟鍒嗙粍', 'sys_job_group', '0', 'admin', sysdate(), '', null, '浠诲姟鍒嗙粍鍒楄〃'); -insert into sys_dict_type values(6, '绯荤粺鏄惁', 'sys_yes_no', '0', 'admin', sysdate(), '', null, '绯荤粺鏄惁鍒楄〃'); -insert into sys_dict_type values(7, '閫氱煡绫诲瀷', 'sys_notice_type', '0', 'admin', sysdate(), '', null, '閫氱煡绫诲瀷鍒楄〃'); -insert into sys_dict_type values(8, '閫氱煡鐘舵', 'sys_notice_status', '0', 'admin', sysdate(), '', null, '閫氱煡鐘舵佸垪琛'); -insert into sys_dict_type values(9, '鎿嶄綔绫诲瀷', 'sys_oper_type', '0', 'admin', sysdate(), '', null, '鎿嶄綔绫诲瀷鍒楄〃'); -insert into sys_dict_type values(10, '绯荤粺鐘舵', 'sys_common_status', '0', 'admin', sysdate(), '', null, '鐧诲綍鐘舵佸垪琛'); - - --- ---------------------------- --- 12銆佸瓧鍏告暟鎹〃 --- ---------------------------- -drop table if exists sys_dict_data; -create table sys_dict_data -( - dict_code bigint(20) not null auto_increment comment '瀛楀吀缂栫爜', - dict_sort int(4) default 0 comment '瀛楀吀鎺掑簭', - dict_label varchar(100) default '' comment '瀛楀吀鏍囩', - dict_value varchar(100) default '' comment '瀛楀吀閿', - dict_type varchar(100) default '' comment '瀛楀吀绫诲瀷', - css_class varchar(100) default null comment '鏍峰紡灞炴э紙鍏朵粬鏍峰紡鎵╁睍锛', - list_class varchar(100) default null comment '琛ㄦ牸鍥炴樉鏍峰紡', - is_default char(1) default 'N' comment '鏄惁榛樿锛圷鏄 N鍚︼級', - status char(1) default '0' comment '鐘舵侊紙0姝e父 1鍋滅敤锛', - create_by varchar(64) default '' comment '鍒涘缓鑰', - create_time datetime comment '鍒涘缓鏃堕棿', - update_by varchar(64) default '' comment '鏇存柊鑰', - update_time datetime comment '鏇存柊鏃堕棿', - remark varchar(500) default null comment '澶囨敞', - primary key (dict_code) -) engine=innodb auto_increment=100 comment = '瀛楀吀鏁版嵁琛'; - -insert into sys_dict_data values(1, 1, '鐢', '0', 'sys_user_sex', '', '', 'Y', '0', 'admin', sysdate(), '', null, '鎬у埆鐢'); -insert into sys_dict_data values(2, 2, '濂', '1', 'sys_user_sex', '', '', 'N', '0', 'admin', sysdate(), '', null, '鎬у埆濂'); -insert into sys_dict_data values(3, 3, '鏈煡', '2', 'sys_user_sex', '', '', 'N', '0', 'admin', sysdate(), '', null, '鎬у埆鏈煡'); -insert into sys_dict_data values(4, 1, '鏄剧ず', '0', 'sys_show_hide', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '鏄剧ず鑿滃崟'); -insert into sys_dict_data values(5, 2, '闅愯棌', '1', 'sys_show_hide', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '闅愯棌鑿滃崟'); -insert into sys_dict_data values(6, 1, '姝e父', '0', 'sys_normal_disable', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '姝e父鐘舵'); -insert into sys_dict_data values(7, 2, '鍋滅敤', '1', 'sys_normal_disable', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '鍋滅敤鐘舵'); -insert into sys_dict_data values(8, 1, '姝e父', '0', 'sys_job_status', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '姝e父鐘舵'); -insert into sys_dict_data values(9, 2, '鏆傚仠', '1', 'sys_job_status', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '鍋滅敤鐘舵'); -insert into sys_dict_data values(10, 1, '榛樿', 'DEFAULT', 'sys_job_group', '', '', 'Y', '0', 'admin', sysdate(), '', null, '榛樿鍒嗙粍'); -insert into sys_dict_data values(11, 2, '绯荤粺', 'SYSTEM', 'sys_job_group', '', '', 'N', '0', 'admin', sysdate(), '', null, '绯荤粺鍒嗙粍'); -insert into sys_dict_data values(12, 1, '鏄', 'Y', 'sys_yes_no', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '绯荤粺榛樿鏄'); -insert into sys_dict_data values(13, 2, '鍚', 'N', 'sys_yes_no', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '绯荤粺榛樿鍚'); -insert into sys_dict_data values(14, 1, '閫氱煡', '1', 'sys_notice_type', '', 'warning', 'Y', '0', 'admin', sysdate(), '', null, '閫氱煡'); -insert into sys_dict_data values(15, 2, '鍏憡', '2', 'sys_notice_type', '', 'success', 'N', '0', 'admin', sysdate(), '', null, '鍏憡'); -insert into sys_dict_data values(16, 1, '姝e父', '0', 'sys_notice_status', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '姝e父鐘舵'); -insert into sys_dict_data values(17, 2, '鍏抽棴', '1', 'sys_notice_status', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '鍏抽棴鐘舵'); -insert into sys_dict_data values(18, 99, '鍏朵粬', '0', 'sys_oper_type', '', 'info', 'N', '0', 'admin', sysdate(), '', null, '鍏朵粬鎿嶄綔'); -insert into sys_dict_data values(19, 1, '鏂板', '1', 'sys_oper_type', '', 'info', 'N', '0', 'admin', sysdate(), '', null, '鏂板鎿嶄綔'); -insert into sys_dict_data values(20, 2, '淇敼', '2', 'sys_oper_type', '', 'info', 'N', '0', 'admin', sysdate(), '', null, '淇敼鎿嶄綔'); -insert into sys_dict_data values(21, 3, '鍒犻櫎', '3', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '鍒犻櫎鎿嶄綔'); -insert into sys_dict_data values(22, 4, '鎺堟潈', '4', 'sys_oper_type', '', 'primary', 'N', '0', 'admin', sysdate(), '', null, '鎺堟潈鎿嶄綔'); -insert into sys_dict_data values(23, 5, '瀵煎嚭', '5', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', sysdate(), '', null, '瀵煎嚭鎿嶄綔'); -insert into sys_dict_data values(24, 6, '瀵煎叆', '6', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', sysdate(), '', null, '瀵煎叆鎿嶄綔'); -insert into sys_dict_data values(25, 7, '寮洪', '7', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '寮洪鎿嶄綔'); -insert into sys_dict_data values(26, 8, '鐢熸垚浠g爜', '8', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', sysdate(), '', null, '鐢熸垚鎿嶄綔'); -insert into sys_dict_data values(27, 9, '娓呯┖鏁版嵁', '9', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '娓呯┖鎿嶄綔'); -insert into sys_dict_data values(28, 1, '鎴愬姛', '0', 'sys_common_status', '', 'primary', 'N', '0', 'admin', sysdate(), '', null, '姝e父鐘舵'); -insert into sys_dict_data values(29, 2, '澶辫触', '1', 'sys_common_status', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '鍋滅敤鐘舵'); - - --- ---------------------------- --- 13銆佸弬鏁伴厤缃〃 --- ---------------------------- -drop table if exists sys_config; -create table sys_config ( - config_id int(5) not null auto_increment comment '鍙傛暟涓婚敭', - config_name varchar(100) default '' comment '鍙傛暟鍚嶇О', - config_key varchar(100) default '' comment '鍙傛暟閿悕', - config_value varchar(500) default '' comment '鍙傛暟閿', - config_type char(1) default 'N' comment '绯荤粺鍐呯疆锛圷鏄 N鍚︼級', - create_by varchar(64) default '' comment '鍒涘缓鑰', - create_time datetime comment '鍒涘缓鏃堕棿', - update_by varchar(64) default '' comment '鏇存柊鑰', - update_time datetime comment '鏇存柊鏃堕棿', - remark varchar(500) default null comment '澶囨敞', - primary key (config_id) -) engine=innodb auto_increment=100 comment = '鍙傛暟閰嶇疆琛'; - -insert into sys_config values(1, '涓绘鏋堕〉-榛樿鐨偆鏍峰紡鍚嶇О', 'sys.index.skinName', 'skin-blue', 'Y', 'admin', sysdate(), '', null, '钃濊壊 skin-blue銆佺豢鑹 skin-green銆佺传鑹 skin-purple銆佺孩鑹 skin-red銆侀粍鑹 skin-yellow' ); -insert into sys_config values(2, '鐢ㄦ埛绠$悊-璐﹀彿鍒濆瀵嗙爜', 'sys.user.initPassword', '123456', 'Y', 'admin', sysdate(), '', null, '鍒濆鍖栧瘑鐮 123456' ); -insert into sys_config values(3, '涓绘鏋堕〉-渚ц竟鏍忎富棰', 'sys.index.sideTheme', 'theme-dark', 'Y', 'admin', sysdate(), '', null, '娣辫壊涓婚theme-dark锛屾祬鑹蹭富棰榯heme-light' ); -insert into sys_config values(4, '璐﹀彿鑷姪-楠岃瘉鐮佸紑鍏', 'sys.account.captchaEnabled', 'true', 'Y', 'admin', sysdate(), '', null, '鏄惁寮鍚獙璇佺爜鍔熻兘锛坱rue寮鍚紝false鍏抽棴锛'); -insert into sys_config values(5, '璐﹀彿鑷姪-鏄惁寮鍚敤鎴锋敞鍐屽姛鑳', 'sys.account.registerUser', 'false', 'Y', 'admin', sysdate(), '', null, '鏄惁寮鍚敞鍐岀敤鎴峰姛鑳斤紙true寮鍚紝false鍏抽棴锛'); -insert into sys_config values(6, '鐢ㄦ埛鐧诲綍-榛戝悕鍗曞垪琛', 'sys.login.blackIPList', '', 'Y', 'admin', sysdate(), '', null, '璁剧疆鐧诲綍IP榛戝悕鍗曢檺鍒讹紝澶氫釜鍖归厤椤逛互;鍒嗛殧锛屾敮鎸佸尮閰嶏紙*閫氶厤銆佺綉娈碉級'); - - --- ---------------------------- --- 14銆佺郴缁熻闂褰 --- ---------------------------- -drop table if exists sys_logininfor; -create table sys_logininfor ( - info_id bigint(20) not null auto_increment comment '璁块棶ID', - user_name varchar(50) default '' comment '鐢ㄦ埛璐﹀彿', - ipaddr varchar(128) default '' comment '鐧诲綍IP鍦板潃', - login_location varchar(255) default '' comment '鐧诲綍鍦扮偣', - browser varchar(50) default '' comment '娴忚鍣ㄧ被鍨', - os varchar(50) default '' comment '鎿嶄綔绯荤粺', - status char(1) default '0' comment '鐧诲綍鐘舵侊紙0鎴愬姛 1澶辫触锛', - msg varchar(255) default '' comment '鎻愮ず娑堟伅', - login_time datetime comment '璁块棶鏃堕棿', - primary key (info_id), - key idx_sys_logininfor_s (status), - key idx_sys_logininfor_lt (login_time) -) engine=innodb auto_increment=100 comment = '绯荤粺璁块棶璁板綍'; - - --- ---------------------------- --- 15銆佸畾鏃朵换鍔¤皟搴﹁〃 --- ---------------------------- -drop table if exists sys_job; -create table sys_job ( - job_id bigint(20) not null auto_increment comment '浠诲姟ID', - job_name varchar(64) default '' comment '浠诲姟鍚嶇О', - job_group varchar(64) default 'DEFAULT' comment '浠诲姟缁勫悕', - invoke_target varchar(500) not null comment '璋冪敤鐩爣瀛楃涓', - cron_expression varchar(255) default '' comment 'cron鎵ц琛ㄨ揪寮', - misfire_policy varchar(20) default '3' comment '璁″垝鎵ц閿欒绛栫暐锛1绔嬪嵆鎵ц 2鎵ц涓娆 3鏀惧純鎵ц锛', - concurrent char(1) default '1' comment '鏄惁骞跺彂鎵ц锛0鍏佽 1绂佹锛', - status char(1) default '0' comment '鐘舵侊紙0姝e父 1鏆傚仠锛', - create_by varchar(64) default '' comment '鍒涘缓鑰', - create_time datetime comment '鍒涘缓鏃堕棿', - update_by varchar(64) default '' comment '鏇存柊鑰', - update_time datetime comment '鏇存柊鏃堕棿', - remark varchar(500) default '' comment '澶囨敞淇℃伅', - primary key (job_id, job_name, job_group) -) engine=innodb auto_increment=100 comment = '瀹氭椂浠诲姟璋冨害琛'; - -insert into sys_job values(1, '绯荤粺榛樿锛堟棤鍙傦級', 'DEFAULT', 'ryTask.ryNoParams', '0/10 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, ''); -insert into sys_job values(2, '绯荤粺榛樿锛堟湁鍙傦級', 'DEFAULT', 'ryTask.ryParams(\'ry\')', '0/15 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, ''); -insert into sys_job values(3, '绯荤粺榛樿锛堝鍙傦級', 'DEFAULT', 'ryTask.ryMultipleParams(\'ry\', true, 2000L, 316.50D, 100)', '0/20 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, ''); - - --- ---------------------------- --- 16銆佸畾鏃朵换鍔¤皟搴︽棩蹇楄〃 --- ---------------------------- -drop table if exists sys_job_log; -create table sys_job_log ( - job_log_id bigint(20) not null auto_increment comment '浠诲姟鏃ュ織ID', - job_name varchar(64) not null comment '浠诲姟鍚嶇О', - job_group varchar(64) not null comment '浠诲姟缁勫悕', - invoke_target varchar(500) not null comment '璋冪敤鐩爣瀛楃涓', - job_message varchar(500) comment '鏃ュ織淇℃伅', - status char(1) default '0' comment '鎵ц鐘舵侊紙0姝e父 1澶辫触锛', - exception_info varchar(2000) default '' comment '寮傚父淇℃伅', - create_time datetime comment '鍒涘缓鏃堕棿', - primary key (job_log_id) -) engine=innodb comment = '瀹氭椂浠诲姟璋冨害鏃ュ織琛'; - - --- ---------------------------- --- 17銆侀氱煡鍏憡琛 --- ---------------------------- -drop table if exists sys_notice; -create table sys_notice ( - notice_id int(4) not null auto_increment comment '鍏憡ID', - notice_title varchar(50) not null comment '鍏憡鏍囬', - notice_type char(1) not null comment '鍏憡绫诲瀷锛1閫氱煡 2鍏憡锛', - notice_content longblob default null comment '鍏憡鍐呭', - status char(1) default '0' comment '鍏憡鐘舵侊紙0姝e父 1鍏抽棴锛', - create_by varchar(64) default '' comment '鍒涘缓鑰', - create_time datetime comment '鍒涘缓鏃堕棿', - update_by varchar(64) default '' comment '鏇存柊鑰', - update_time datetime comment '鏇存柊鏃堕棿', - remark varchar(255) default null comment '澶囨敞', - primary key (notice_id) -) engine=innodb auto_increment=10 comment = '閫氱煡鍏憡琛'; - --- ---------------------------- --- 鍒濆鍖-鍏憡淇℃伅琛ㄦ暟鎹 --- ---------------------------- -insert into sys_notice values('1', '娓╅Θ鎻愰啋锛2018-07-01 鑻ヤ緷鏂扮増鏈彂甯冨暒', '2', '鏂扮増鏈唴瀹', '0', 'admin', sysdate(), '', null, '绠$悊鍛'); -insert into sys_notice values('2', '缁存姢閫氱煡锛2018-07-01 鑻ヤ緷绯荤粺鍑屾櫒缁存姢', '1', '缁存姢鍐呭', '0', 'admin', sysdate(), '', null, '绠$悊鍛'); - - --- ---------------------------- --- 18銆佷唬鐮佺敓鎴愪笟鍔¤〃 --- ---------------------------- -drop table if exists gen_table; -create table gen_table ( - table_id bigint(20) not null auto_increment comment '缂栧彿', - table_name varchar(200) default '' comment '琛ㄥ悕绉', - table_comment varchar(500) default '' comment '琛ㄦ弿杩', - sub_table_name varchar(64) default null comment '鍏宠仈瀛愯〃鐨勮〃鍚', - sub_table_fk_name varchar(64) default null comment '瀛愯〃鍏宠仈鐨勫閿悕', - class_name varchar(100) default '' comment '瀹炰綋绫诲悕绉', - tpl_category varchar(200) default 'crud' comment '浣跨敤鐨勬ā鏉匡紙crud鍗曡〃鎿嶄綔 tree鏍戣〃鎿嶄綔锛', - tpl_web_type varchar(30) default '' comment '鍓嶇妯℃澘绫诲瀷锛坋lement-ui妯$増 element-plus妯$増锛', - package_name varchar(100) comment '鐢熸垚鍖呰矾寰', - module_name varchar(30) comment '鐢熸垚妯″潡鍚', - business_name varchar(30) comment '鐢熸垚涓氬姟鍚', - function_name varchar(50) comment '鐢熸垚鍔熻兘鍚', - function_author varchar(50) comment '鐢熸垚鍔熻兘浣滆', - gen_type char(1) default '0' comment '鐢熸垚浠g爜鏂瑰紡锛0zip鍘嬬缉鍖 1鑷畾涔夎矾寰勶級', - gen_path varchar(200) default '/' comment '鐢熸垚璺緞锛堜笉濉粯璁ら」鐩矾寰勶級', - options varchar(1000) comment '鍏跺畠鐢熸垚閫夐」', - create_by varchar(64) default '' comment '鍒涘缓鑰', - create_time datetime comment '鍒涘缓鏃堕棿', - update_by varchar(64) default '' comment '鏇存柊鑰', - update_time datetime comment '鏇存柊鏃堕棿', - remark varchar(500) default null comment '澶囨敞', - primary key (table_id) -) engine=innodb auto_increment=1 comment = '浠g爜鐢熸垚涓氬姟琛'; - - --- ---------------------------- --- 19銆佷唬鐮佺敓鎴愪笟鍔¤〃瀛楁 --- ---------------------------- -drop table if exists gen_table_column; -create table gen_table_column ( - column_id bigint(20) not null auto_increment comment '缂栧彿', - table_id bigint(20) comment '褰掑睘琛ㄧ紪鍙', - column_name varchar(200) comment '鍒楀悕绉', - column_comment varchar(500) comment '鍒楁弿杩', - column_type varchar(100) comment '鍒楃被鍨', - java_type varchar(500) comment 'JAVA绫诲瀷', - java_field varchar(200) comment 'JAVA瀛楁鍚', - is_pk char(1) comment '鏄惁涓婚敭锛1鏄級', - is_increment char(1) comment '鏄惁鑷锛1鏄級', - is_required char(1) comment '鏄惁蹇呭~锛1鏄級', - is_insert char(1) comment '鏄惁涓烘彃鍏ュ瓧娈碉紙1鏄級', - is_edit char(1) comment '鏄惁缂栬緫瀛楁锛1鏄級', - is_list char(1) comment '鏄惁鍒楄〃瀛楁锛1鏄級', - is_query char(1) comment '鏄惁鏌ヨ瀛楁锛1鏄級', - query_type varchar(200) default 'EQ' comment '鏌ヨ鏂瑰紡锛堢瓑浜庛佷笉绛変簬銆佸ぇ浜庛佸皬浜庛佽寖鍥达級', - html_type varchar(200) comment '鏄剧ず绫诲瀷锛堟枃鏈銆佹枃鏈煙銆佷笅鎷夋銆佸閫夋銆佸崟閫夋銆佹棩鏈熸帶浠讹級', - dict_type varchar(200) default '' comment '瀛楀吀绫诲瀷', - sort int comment '鎺掑簭', - create_by varchar(64) default '' comment '鍒涘缓鑰', - create_time datetime comment '鍒涘缓鏃堕棿', - update_by varchar(64) default '' comment '鏇存柊鑰', - update_time datetime comment '鏇存柊鏃堕棿', - primary key (column_id) -) engine=innodb auto_increment=1 comment = '浠g爜鐢熸垚涓氬姟琛ㄥ瓧娈'; \ No newline at end of file